From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 8 Jun 2008 10:02:33 +0000 (+0000)
Subject: Optimize prepare-two-tapes + add -j3 to make
X-Git-Tag: Release-7.0.0~4485
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e8c8ad6e102e2b455e9da1c81158b7649c3ee131;p=bacula%2Fbacula

Optimize prepare-two-tapes + add -j3 to make

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7115 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/scripts/prepare-two-tapes.in b/regress/scripts/prepare-two-tapes.in
index 642a8f850c..18f61c160f 100755
--- a/regress/scripts/prepare-two-tapes.in
+++ b/regress/scripts/prepare-two-tapes.in
@@ -17,36 +17,35 @@ if test x@autochanger@ != x/dev/null; then
    case $slot in
    0)
       bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
-      init_drive @tape_drive@
       slot=$SLOT1
       ;;
    $SLOT1)
-      init_drive @tape_drive@
       slot=$SLOT1
       ;;
    $SLOT2)
-      init_drive @tape_drive@
       slot=$SLOT2
       ;;
    default)
       bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
       bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
-      init_drive @tape_drive@
       slot=$SLOT1
       ;;
   esac
+  init_drive @tape_drive@
+  bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
+
 
 # init the other slot
   case $slot in
    $SLOT1)
-      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
       bin/@changer_script@ @autochanger@ load $SLOT2 @tape_drive@ $DRIVE1
-      init_drive @tape_drive@
       ;;
    $SLOT2)
-      bin/@changer_script@ @autochanger@ unload $slot @tape_drive@ $DRIVE1
       bin/@changer_script@ @autochanger@ load $SLOT1 @tape_drive@ $DRIVE1
-      init_drive @tape_drive@
       ;;
+   default)
+      echo "Something went wrong. Expected $SLOT1 or $SLOT2, got $slot"
+      exit 1
    esac
+   init_drive @tape_drive@
 fi
diff --git a/regress/scripts/setup b/regress/scripts/setup
index e452fa1f01..d9dc1533ec 100755
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -33,7 +33,7 @@ check_exit_code
 cd src/win32
 make clean
 cd ../..
-make
+make -j3
 check_exit_code
 make install
 check_exit_code