From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 10 Nov 2007 10:53:11 +0000 (+0000)
Subject: Merge changes from trunk
X-Git-Tag: Release-2.2.6~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c723baa34a0e46fd146ac4ed89fab1dff3ba3986;p=bacula%2Fbacula

Merge changes from trunk

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5885 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests
index 831e232728..fc5f16c1e8 100755
--- a/regress/all-non-root-tests
+++ b/regress/all-non-root-tests
@@ -60,7 +60,7 @@ echo "End non-root disk tests" >>test.out
 echo " "
 echo " " >>test.out
 echo "Start non-root virtual disk autochanger tests"
-echo "Start non-root virtual disk autochangertests" >>test.out
+echo "Start non-root virtual disk autochanger tests" >>test.out
 #nice tests/three-pool-recycle-test
 nice tests/two-pool-test
 nice tests/fast-two-pool-test
@@ -73,4 +73,4 @@ nice tests/incremental-2media
 nice tests/three-pool-test
 nice tests/2drive-3pool-test
 echo "End non-root virtual disk autochanger tests"
-echo "End non-root virtual disk autochangertests" >>test.out
+echo "End non-root virtual disk autochanger tests" >>test.out
diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index 36fcfbff33..9202de981f 100644
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.conf.in
@@ -216,7 +216,7 @@ Pool {
   Storage = File
   Migration High Bytes = 40M
   Migration Low Bytes = 20M
-  Migration Time = 60
+  Migration Time = 1
 }
 
 Pool {
diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test
index 99de021cf2..96e968bb02 100755
--- a/regress/tests/migration-time-test
+++ b/regress/tests/migration-time-test
@@ -39,20 +39,18 @@ run job=$JobName level=Full yes
 run job=$JobName level=Full yes
 wait
 update volume=FileVolume001 VolStatus=Used
-sql
-update Job SET RealEndTime='2004-01-01 12:01:01' WHERE JobId IN (2,3);
-
 llist jobid=2,3
 list jobs
 list volumes
+@#setdebug level=20 dir
 @# should migrate only jobid=2 and 3
 run job=migrate-time yes
 wait
 messages
 wait
-purge volume=FileVolume001
 list jobs
 list volumes
+purge volume=FileVolume001
 @# 
 @# now do a restore
 @#
diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 1c1c34d294..dbd88e00af 100755
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -74,6 +74,5 @@ cd ${cwd}
 check_two_logs
 #diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null
 diff ${cwd}/tmp/original ${cwd}/tmp/restored                
- 
 dstat=$?
 end_test
diff --git a/regress/win32/all-non-root-2tape-tests.cmd b/regress/win32/all-non-root-2tape-tests.cmd
index 28ba14eb59..e23bbaa39d 100644
--- a/regress/win32/all-non-root-2tape-tests.cmd
+++ b/regress/win32/all-non-root-2tape-tests.cmd
@@ -1,11 +1,9 @@
 REM
 REM Run all tape tests
 REM
-CALL tests\test0
+ECHO Start two tape tests
+ECHO Start two tape tests >>test.out
 CALL tests\two-volume-tape
 CALL tests\incremental-2tape
-ECHO.
-ECHO.
-echo 2 Tape Test results
-TYPE test.out
-CALL scripts\cleanup
+ECHO End two tape tests
+ECHO End two tape tests >>test.out
diff --git a/regress/win32/all-non-root-tape-tests.cmd b/regress/win32/all-non-root-tape-tests.cmd
index 5eec40d7bb..0ec392b462 100644
--- a/regress/win32/all-non-root-tape-tests.cmd
+++ b/regress/win32/all-non-root-tape-tests.cmd
@@ -3,8 +3,11 @@ REM Run all tape tests
 REM
 CALL config_var
 IF NOT "%AUTOCHANGER%" == "nul" mtx -f %AUTOCHANGER% load 1 >nul 2>&1
-COPY test.out test1.out
-CALL tests\test0
+ECHO.
+ECHO. >>test.out
+ECHO Start all non-root tape tests
+ECHO Start all non-root tape tests >>test.out
+REM CALL tests\ansi-label-tape
 CALL tests\backup-bacula-tape
 CALL tests\btape-fill-tape
 CALL tests\fixed-block-size-tape
@@ -19,8 +22,5 @@ CALL tests\two-pool-tape
 CALL tests\2drive-incremental-2tape
 CALL tests\bscan-tape
 CALL tests\verify-vol-tape
-ECHO.
-ECHO.
-ECHO Test results
-TYPE test.out
-CALL scripts\cleanup
+ECHO End all non-root tape tests
+ECHO End all non-root tape tests >>test.out
diff --git a/regress/win32/all-non-root-tests.cmd b/regress/win32/all-non-root-tests.cmd
index faeb4699ae..5c5a036ee4 100644
--- a/regress/win32/all-non-root-tests.cmd
+++ b/regress/win32/all-non-root-tests.cmd
@@ -1,17 +1,29 @@
 REM
 REM Run all tests
 REM
-DEL test1.out
-CALL tests\test0
 ECHO.
+ECHO. >>test.out
+ECHO Start non-root disk tests
+ECHO Start non-root disk tests >>test.out 
 CALL tests\auto-label-test
 CALL tests\backup-bacula-test
 CALL tests\bextract-test
+REM CALL tests\big-vol-test
 CALL tests\bscan-test
 CALL tests\bsr-opt-test
 CALL tests\compressed-test
+REM CALL tests\compress-encrypt-test
 CALL tests\concurrent-jobs-test
 CALL tests\data-encrypt-test
+REM CALL tests\encrypt-bug-test
+REM CALL tests\fifo-test
+REM CALL tests\backup-to-null
+REM CALL tests\regexwhere-test
+REM The following two can uses *lots* of disk space
+REM   so they are normally turned off, but if you have
+REM   at least two GB free, you can run them
+REM CALL tests\sparse-encrypt-test
+REM CALL tests\gigaslam-sparse-test
 CALL tests\differential-test
 CALL tests\four-concurrent-jobs-test
 CALL tests\four-jobs-test
@@ -21,8 +33,11 @@ CALL tests\recycle-test
 CALL tests\restore2-by-file-test
 CALL tests\restore-by-file-test
 CALL tests\restore-disk-seek-test
+REM CALL tests\runscript-test
 CALL tests\six-vol-test
 CALL tests\span-vol-test
+REM CALL tests\maxvol-test
+REM CALL tests\maxvol2-test
 CALL tests\sparse-compressed-test
 CALL tests\sparse-test
 CALL tests\two-jobs-test
@@ -35,14 +50,25 @@ CALL tests\migration-jobspan-test
 CALL tests\migration-volume-test
 CALL tests\migration-time-test
 REM CALL tests\hardlink-test
+REM CALL tests\tls-test
+ECHO End non-root disk tests
+ECHO End non-root disk tests >>test.out
+
 REM 
 REM The following are Virtual Disk Autochanger tests
+ECHO.
+ECHO. >>test.out
+ECHO Start non-root virtual disk autochanger tests
+ECHO Start non-root virtual disk autochanger tests >>test.out
+REM CALL tests\three-pool-recycle-test
 CALL tests\two-pool-test
+REM CALL tests\fast-two-pool-test
 CALL tests\two-volume-test
 CALL tests\incremental-2disk
 CALL tests\2drive-incremental-2disk
 CALL tests\scratch-pool-test
-ECHO.
-ECHO Test results
-TYPE test.out
-CALL scripts\cleanup
+CALL tests\2drive-concurrent-test.cmd
+REM CALL tests\incremental-2media
+REM CALL tests\three-pool-test
+ECHO End non-root virtual disk autochanger tests
+ECHO End non-root virtual disk autochanger tests >>test.out
diff --git a/regress/win32/all-root-tests.cmd b/regress/win32/all-root-tests.cmd
index 20061b1768..829d9f48a7 100644
--- a/regress/win32/all-root-tests.cmd
+++ b/regress/win32/all-root-tests.cmd
@@ -1,10 +1,13 @@
 REM
 REM Run all root tests
 REM
-DEL test.out
+ECHO.
+ECHO. >>test.out
+ECHO Start root tests
+ECHO Start root tests >>test.out
 CALL tests\dev-test-root
 CALL tests\etc-test-root
 CALL tests\lib-test-root
 CALL tests\usr-tape-root
-TYPE test.out
-CALL scripts\cleanup
+ECHO End root tests
+ECHO End root tests >>test.out
diff --git a/regress/win32/all-tests.cmd b/regress/win32/all-tests.cmd
index 62ffa6e940..9aac351024 100644
--- a/regress/win32/all-tests.cmd
+++ b/regress/win32/all-tests.cmd
@@ -3,5 +3,3 @@ REM Run all tests
 REM
 CALL all-non-root-tests
 CALL all-root-tests
-TYPE test.out
-CALL scripts\cleanup
diff --git a/regress/win32/scripts/bacula-dir-migration.conf.in b/regress/win32/scripts/bacula-dir-migration.conf.in
index 312feb5205..a5325e815a 100644
--- a/regress/win32/scripts/bacula-dir-migration.conf.in
+++ b/regress/win32/scripts/bacula-dir-migration.conf.in
@@ -25,7 +25,7 @@ Director {                            # define myself
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @tmpdir@
 Job {
   Name = "NightlySave"
   Type = Backup
@@ -110,7 +110,7 @@ Job {
   Storage = File
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -118,7 +118,7 @@ Job {
 FileSet {
   Name = "Full Set"
   Include { Options { signature=MD5 }
-    File =  </tmp/file-list
+    File =  <@tmpdir@/file-list
   }
 }
 
diff --git a/regress/win32/scripts/bacula-dir-tape.conf.in b/regress/win32/scripts/bacula-dir-tape.conf.in
index 153fd61d35..8edce82ea9 100644
--- a/regress/win32/scripts/bacula-dir-tape.conf.in
+++ b/regress/win32/scripts/bacula-dir-tape.conf.in
@@ -25,7 +25,7 @@ Director {                            # define myself
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @tmpdir@
 Job {
   Name = "NightlySave"
   Type = Backup
@@ -96,7 +96,7 @@ Job {
   Storage = DDS-4
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -104,7 +104,7 @@ Job {
 FileSet {
   Name = "Full Set"
   Include { Options { signature=MD5 }
-    File =  </tmp/file-list
+    File =  <@tmpdir@/file-list
   }
 }
 
@@ -115,7 +115,7 @@ FileSet {
        signature=MD5
        verify=pins1
     }
-    File =  </tmp/file-list
+    File =  <@tmpdir@/file-list
   }
 }
 
diff --git a/regress/win32/scripts/bacula-dir-win32-tape.conf.in b/regress/win32/scripts/bacula-dir-win32-tape.conf.in
index 19bbd18546..5685da0bee 100644
--- a/regress/win32/scripts/bacula-dir-win32-tape.conf.in
+++ b/regress/win32/scripts/bacula-dir-win32-tape.conf.in
@@ -25,7 +25,7 @@ Director {                            # define myself
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @tmpdir@
 Job {
   Name = "NightlySave"
   Type = Backup
@@ -49,7 +49,7 @@ Job {
   Storage = DDS-4
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
diff --git a/regress/win32/scripts/copy-2disk-confs.cmd b/regress/win32/scripts/copy-2disk-confs.cmd
index e759a41413..4a67c06a2a 100644
--- a/regress/win32/scripts/copy-2disk-confs.cmd
+++ b/regress/win32/scripts/copy-2disk-confs.cmd
@@ -6,4 +6,4 @@ COPY scripts\bacula-sd-2disk.conf bin\bacula-sd.conf
 COPY scripts\test-bacula-fd.conf bin\bacula-fd.conf
 COPY scripts\test-console.conf bin\bconsole.conf
 COPY bin\bacula-dir.conf tmp\1
-bin\sed -e "s;# Autochanger = yes;  Autochanger = yes;g" tmp\1 >bin\bacula-dir.conf
+sed -e "s;# Autochanger = yes;  Autochanger = yes;g" tmp\1 >bin\bacula-dir.conf
diff --git a/regress/win32/scripts/copy-2disk-drive-confs.cmd b/regress/win32/scripts/copy-2disk-drive-confs.cmd
index 173eec2df0..1599cd5090 100644
--- a/regress/win32/scripts/copy-2disk-drive-confs.cmd
+++ b/regress/win32/scripts/copy-2disk-drive-confs.cmd
@@ -3,4 +3,4 @@ COPY scripts\bacula-sd-2disk-drive.conf bin\bacula-sd.conf
 COPY scripts\test-bacula-fd.conf bin\bacula-fd.conf
 COPY scripts\test-console.conf bin\bconsole.conf
 COPY bin\bacula-dir.conf tmp\1
-bin\sed -e "s;# Autochanger = yes;  Autochanger = yes;g" tmp\1 >bin\bacula-dir.conf
+sed -e "s;# Autochanger = yes;  Autochanger = yes;g" tmp\1 >bin\bacula-dir.conf
diff --git a/regress/win32/scripts/copy-2drive-confs.cmd b/regress/win32/scripts/copy-2drive-confs.cmd
index d20bf19ca9..3c6ff2f815 100644
--- a/regress/win32/scripts/copy-2drive-confs.cmd
+++ b/regress/win32/scripts/copy-2drive-confs.cmd
@@ -4,7 +4,7 @@ COPY scripts\test-bacula-fd.conf bin\bacula-fd.conf
 COPY scripts\test-console.conf bin\bconsole.conf
 
 COPY bin\bacula-dir.conf tmp\1
-bin\sed -e "s;# Autochanger = yes;  Autochanger = yes;g" >bin\bacula-dir.conf
+sed -e "s;# Autochanger = yes;  Autochanger = yes;g" >bin\bacula-dir.conf
 
 REM get proper SD tape definitions
 COPY scripts\win32_tape_options bin\tape_options
diff --git a/regress/win32/scripts/copy-2tape-confs.cmd b/regress/win32/scripts/copy-2tape-confs.cmd
index 3e5af7aa12..2e9024e111 100644
--- a/regress/win32/scripts/copy-2tape-confs.cmd
+++ b/regress/win32/scripts/copy-2tape-confs.cmd
@@ -4,7 +4,7 @@ COPY scripts\test-bacula-fd.conf bin\bacula-fd.conf
 COPY scripts\test-console.conf bin\bconsole.conf
 
 COPY bin\bacula-dir.conf tmp\1
-bin\sed -e "s;# Autochanger = yes;  Autochanger = yes;g" tmp\1 >bin\bacula-dir.conf
+sed -e "s;# Autochanger = yes;  Autochanger = yes;g" tmp\1 >bin\bacula-dir.conf
 
 REM get proper SD tape definitions
 COPY scripts\win32_tape_options bin\tape_options
diff --git a/regress/win32/scripts/disk-changer.cmd b/regress/win32/scripts/disk-changer.cmd
index 3efb1933ce..efb2d30433 100644
--- a/regress/win32/scripts/disk-changer.cmd
+++ b/regress/win32/scripts/disk-changer.cmd
@@ -55,7 +55,7 @@ REM  C:\Temp\bacula\slot3, ...) this script will create a C:\Temp\bacula\loadedn
 REM  file to keep track of what Slot is loaded. You should not change this file.
 REM
 
-SET dbgfile=%CD%\disk-changer.log
+SET dbgfile=disk-changer.log
 
 REM to turn on logging, uncomment the following line
 IF NOT EXIST %dbgfile% COPY nul %dbgfile% >nul
diff --git a/regress/win32/scripts/do_sed.cmd b/regress/win32/scripts/do_sed.cmd
index a533a303f8..ba359401dc 100644
--- a/regress/win32/scripts/do_sed.cmd
+++ b/regress/win32/scripts/do_sed.cmd
@@ -41,33 +41,33 @@ ECHO SET AUTOCHANGER_PATH=%5 >>config_out.cmd
 ECHO SET TAPE_DRIVE1=%6 >>config_out.cmd
 
 REM process .in files with sed script
-sed -f %out% %CD%\scripts\test-bacula-dir.conf.in >%CD%\scripts\test-bacula-dir.conf
-sed -f %out% %CD%\scripts\new-test-bacula-dir.conf.in >%CD%\scripts\new-test-bacula-dir.conf
-sed -f %out% %CD%\scripts\testa-bacula-dir.conf.in >%CD%\scripts\testa-bacula-dir.conf
-sed -f %out% %CD%\scripts\test-bacula-fd.conf.in >%CD%\scripts\test-bacula-fd.conf
-sed -f %out% %CD%\scripts\test-bacula-sd.conf.in >%CD%\scripts\test-bacula-sd.conf
-sed -f %out% %CD%\scripts\test-console.conf.in >%CD%\scripts\test-console.conf
-sed -f %out% %CD%\scripts\crypto-bacula-fd.conf.in >%CD%\scripts\crypto-bacula-fd.conf
-sed -f %out% %CD%\scripts\bacula-dir-tape.conf.in >%CD%\scripts\bacula-dir-tape.conf
-sed -f %out% %CD%\scripts\bacula-dir-migration.conf.in >%CD%\scripts\bacula-dir-migration.conf
-sed -f %out% %CD%\scripts\win32-bacula-dir-tape.conf.in >%CD%\scripts\win32-bacula-dir-tape.conf
-sed -f %out% %CD%\scripts\bacula-sd-tape.conf.in >%CD%\scripts\bacula-sd-tape.conf
-sed -f %out% %CD%\scripts\bacula-sd-2tape.conf.in >%CD%\scripts\bacula-sd-2tape.conf
-sed -f %out% %CD%\scripts\bacula-sd-migration.conf.in >%CD%\scripts\bacula-sd-migration.conf
-sed -f %out% %CD%\scripts\bacula-sd-2disk.conf.in >%CD%\scripts\bacula-sd-2disk.conf
-sed -f %out% %CD%\scripts\bacula-sd-2drive.conf.in >%CD%\scripts\bacula-sd-2drive.conf
-sed -f %out% %CD%\scripts\bacula-sd-2disk-drive.conf.in >%CD%\scripts\bacula-sd-2disk-drive.conf
-sed -f %out% %CD%\scripts\cleanup-tape.cmd.in >%CD%\scripts\cleanup-tape.cmd
-sed -f %out% %CD%\scripts\cleanup-2tape.cmd.in >%CD%\scripts\cleanup-2tape.cmd
-sed -f %out% %CD%\scripts\cleanup-2drive.cmd.in >%CD%\scripts\cleanup-2drive.cmd
-sed -f %out% %CD%\scripts\prepare-two-tapes.cmd.in >%CD%\scripts\prepare-two-tapes.cmd
-sed -f %out% %CD%\scripts\bacula-dir.conf.testrunscript.in >%CD%\scripts\bacula-dir.conf.testrunscript
+sed -f %out% scripts\test-bacula-dir.conf.in >scripts\test-bacula-dir.conf
+sed -f %out% scripts\new-test-bacula-dir.conf.in >scripts\new-test-bacula-dir.conf
+sed -f %out% scripts\testa-bacula-dir.conf.in >scripts\testa-bacula-dir.conf
+sed -f %out% scripts\test-bacula-fd.conf.in >scripts\test-bacula-fd.conf
+sed -f %out% scripts\test-bacula-sd.conf.in >scripts\test-bacula-sd.conf
+sed -f %out% scripts\test-console.conf.in >scripts\test-console.conf
+sed -f %out% scripts\crypto-bacula-fd.conf.in >scripts\crypto-bacula-fd.conf
+sed -f %out% scripts\bacula-dir-tape.conf.in >scripts\bacula-dir-tape.conf
+sed -f %out% scripts\bacula-dir-migration.conf.in >scripts\bacula-dir-migration.conf
+sed -f %out% scripts\win32-bacula-dir-tape.conf.in >scripts\win32-bacula-dir-tape.conf
+sed -f %out% scripts\bacula-sd-tape.conf.in >scripts\bacula-sd-tape.conf
+sed -f %out% scripts\bacula-sd-2tape.conf.in >scripts\bacula-sd-2tape.conf
+sed -f %out% scripts\bacula-sd-migration.conf.in >scripts\bacula-sd-migration.conf
+sed -f %out% scripts\bacula-sd-2disk.conf.in >scripts\bacula-sd-2disk.conf
+sed -f %out% scripts\bacula-sd-2drive.conf.in >scripts\bacula-sd-2drive.conf
+sed -f %out% scripts\bacula-sd-2disk-drive.conf.in >scripts\bacula-sd-2disk-drive.conf
+sed -f %out% scripts\cleanup-tape.cmd.in >scripts\cleanup-tape.cmd
+sed -f %out% scripts\cleanup-2tape.cmd.in >scripts\cleanup-2tape.cmd
+sed -f %out% scripts\cleanup-2drive.cmd.in >scripts\cleanup-2drive.cmd
+sed -f %out% scripts\prepare-two-tapes.cmd.in >scripts\prepare-two-tapes.cmd
+sed -f %out% scripts\bacula-dir.conf.testrunscript.in >scripts\bacula-dir.conf.testrunscript
 
-COPY %CD%\bin\bacula-sd.conf tmp\bacula-sd.tmp >nul
-sed -e "s;C:\\Temp;%CD:\=/%/tmp;g" tmp\bacula-sd.tmp >%CD%\bin\bacula-sd.conf
+COPY bin\bacula-sd.conf tmp\bacula-sd.tmp >nul
+sed -e "s;C:\\Temp;%CD:\=/%/tmp;g" tmp\bacula-sd.tmp >bin\bacula-sd.conf
 
 REM get proper SD tape definitions
-COPY %CD%\scripts\win32_tape_options %CD%\bin\tape_options >nul
+COPY scripts\win32_tape_options bin\tape_options >nul
 
 DEL %out%
 DEL tmp\*.tmp
diff --git a/regress/win32/scripts/functions.cmd b/regress/win32/scripts/functions.cmd
index 1a03141c14..0396fe1925 100644
--- a/regress/win32/scripts/functions.cmd
+++ b/regress/win32/scripts/functions.cmd
@@ -52,7 +52,7 @@ GOTO %routine%
 
 :run_bscan
    IF %debug% EQU 1 (
-      bin\bscan %1 %2 %3 %4 %5 %6 %7 %8 %9 | tools\tee tmp\log.out
+      bin\bscan %1 %2 %3 %4 %5 %6 %7 %8 %9 | tee tmp\log.out
    ) ELSE (
       bin\bscan %1 %2 %3 %4 %5 %6 %7 %8 %9 >nul 2>&1
    )
@@ -76,24 +76,24 @@ GOTO %routine%
    )
    IF EXIST bin\1 DEL /f bin\1
    REN bin\bacula-dir.conf 1
-   bin\sed -e "s;%oldname%;%newname%;g" bin\1 >bin\bacula-dir.conf
+   sed -e "s;%oldname%;%newname%;g" bin\1 >bin\bacula-dir.conf
 REM  ECHO Job %oldname% changed to %newname%
    GOTO :EOF
 
 :check_two_logs
-   tools\grep "^  Termination: *Backup OK" tmp\log1.out >nul 2>&1
+   grep "^  Termination: *Backup OK" tmp\log1.out >nul 2>&1
    SET bstat=%ERRORLEVEL%
-   tools\grep "^  Termination: *Restore OK" tmp\log2.out >nul 2>&1
+   grep "^  Termination: *Restore OK" tmp\log2.out >nul 2>&1
    SET rstat=%ERRORLEVEL%
    GOTO :EOF
 
 :check_restore_diff
-   tools\diff -r build tmp\bacula-restores\%CD::=%\build >nul 2>&1
+   diff -r build tmp\bacula-restores\%CD::=%\build >nul 2>&1
    SET dstat=%ERRORLEVEL%
    GOTO :EOF
 
 :check_restore_tmp_build_diff
-   tools\diff -r tmp\build tmp\bacula-restores\%CD::=%\tmp\build >nul 2>&1
+   diff -r tmp\build tmp\bacula-restores\%CD::=%\tmp\build >nul 2>&1
    SET dstat=%ERRORLEVEL%
    GOTO :EOF
 
diff --git a/regress/win32/scripts/install_bacula.cmd b/regress/win32/scripts/install_bacula.cmd
index a799e3d25d..e2e9ecd428 100644
--- a/regress/win32/scripts/install_bacula.cmd
+++ b/regress/win32/scripts/install_bacula.cmd
@@ -22,7 +22,7 @@ COPY build\src\win32\installer\%1\*.manifest bin >nul
 COPY build\src\win32\%1\*.pdb bin >nul
 COPY build\src\win32\installer\%1\query.sql bin >nul
 
-COPY bin\cats_sqlite3.dll bin\bacula_cats3.dll >nul
+COPY bin\cats_sqlite3.dll bin\bacula_cats.dll >nul
 
 FOR /f %%i IN ( 'cmd /c openssl.exe rand -base64 33 2^>nul' ) DO SET CLIENT_PASSWORD=%%i
 FOR /f %%i IN ( 'cmd /c openssl.exe rand -base64 33 2^>nul' ) DO SET STORAGE_PASSWORD=%%i
@@ -64,13 +64,13 @@ ECHO s;@tape_drive1@;%7;g >>install.sed
 FOR %%i in ( %CATS% ) DO (
    SET NAME=%%i
    SET TARGET=bin\!NAME:sqlite3=bacula!
-   tools\sed -f install.sed build\src\win32\installer\%1\!NAME! > !TARGET!
+   sed -f install.sed build\src\win32\installer\%1\!NAME! > !TARGET!
 )
 
-FOR %%i in ( %CONFS% ) DO tools\sed -f install.sed build\src\win32\installer\%%i > bin\%%~ni
+FOR %%i in ( %CONFS% ) DO sed -f install.sed build\src\win32\installer\%%i > bin\%%~ni
 
-tools\sed -f install.sed build\src\win32\installer\%1\make_sqlite3_tables.sql > bin\make_sqlite3_tables.sql
-tools\sed -f install.sed build\src\win32\installer\%1\mtx-changer.cmd > bin\mtx-changer.cmd
+sed -f install.sed build\src\win32\installer\%1\make_sqlite3_tables.sql > bin\make_sqlite3_tables.sql
+sed -f install.sed build\src\win32\installer\%1\mtx-changer.cmd > bin\mtx-changer.cmd
 
 CALL scripts\bacula uninstall
 CALL scripts\bacula install %CD%\bin
diff --git a/regress/win32/scripts/new-test-bacula-dir.conf.in b/regress/win32/scripts/new-test-bacula-dir.conf.in
index 7302f0c73d..8d24b9145d 100644
--- a/regress/win32/scripts/new-test-bacula-dir.conf.in
+++ b/regress/win32/scripts/new-test-bacula-dir.conf.in
@@ -26,7 +26,7 @@ Director {                            # define myself
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @tmpdir@
 Job {
   Name = "NightlySave"
   Type = Backup
@@ -140,7 +140,7 @@ Job {
   Storage = File
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -148,7 +148,7 @@ Job {
 FileSet {
   Name = "Full Set"
   Include {  Options { signature=MD5 }
-     File =  </tmp/file-list
+     File =  <@tmpdir@/file-list
   }
 }
 
@@ -158,7 +158,7 @@ FileSet {
     Options {
       signature=MD5 sparse=yes
     }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
@@ -168,7 +168,7 @@ FileSet {
     Options {
       signature=MD5 compression=GZIP 
     }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
@@ -179,7 +179,7 @@ FileSet {
       signature=MD5 compression=GZIP
       sparse=yes
     }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
diff --git a/regress/win32/scripts/test-bacula-dir.conf.in b/regress/win32/scripts/test-bacula-dir.conf.in
index 93008cca82..b07b3fa377 100644
--- a/regress/win32/scripts/test-bacula-dir.conf.in
+++ b/regress/win32/scripts/test-bacula-dir.conf.in
@@ -26,7 +26,7 @@ Director {                            # define myself
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @tmpdir@
 Job {
   Name = "NightlySave"
   Type = Backup
@@ -127,7 +127,7 @@ Job {
   Storage = File
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -135,14 +135,14 @@ Job {
 FileSet {
   Name = "Full Set"
   Include  { Options { signature=MD5 }
-    File = </tmp/file-list
+    File = <@tmpdir@/file-list
   }
 }
 
 FileSet {
   Name = "SparseSet"
   Include { Options { signature=MD5; sparse=yes }
-    File=</tmp/file-list
+    File=<@tmpdir@/file-list
   }
 }
 
@@ -150,7 +150,7 @@ FileSet {
   Name = "CompressedSet"
   Include {
     Options { signature=MD5; compression=GZIP }
-    File =</tmp/file-list
+    File =<@tmpdir@/file-list
   }
 }
 
@@ -160,7 +160,7 @@ FileSet {
     Options {
       signature=MD5; compression=GZIP
     }
-    File= </tmp/file-list
+    File= <@tmpdir@/file-list
   }
 }
 
diff --git a/regress/win32/scripts/testa-bacula-dir.conf.in b/regress/win32/scripts/testa-bacula-dir.conf.in
index 1cbd9a3fec..763b95fe75 100644
--- a/regress/win32/scripts/testa-bacula-dir.conf.in
+++ b/regress/win32/scripts/testa-bacula-dir.conf.in
@@ -54,7 +54,7 @@ Job {
   Storage = File
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
@@ -62,7 +62,7 @@ Job {
 FileSet {
   Name = "Full Set"
   Include { Options { signature=SHA1 }
-    File =</tmp/file-list
+    File =<@tmpdir@/file-list
   }
 }
 
diff --git a/regress/win32/scripts/win32-bacula-dir-tape.conf.in b/regress/win32/scripts/win32-bacula-dir-tape.conf.in
index 206e000199..e23729a316 100644
--- a/regress/win32/scripts/win32-bacula-dir-tape.conf.in
+++ b/regress/win32/scripts/win32-bacula-dir-tape.conf.in
@@ -25,7 +25,7 @@ Director {                            # define myself
 
 #
 # Define the main nightly save backup job
-#   By default, this job will back up to disk in /tmp
+#   By default, this job will back up to disk in @tmpdir@
 Job {
   Name = "NightlySave"
   Type = Backup
@@ -49,7 +49,7 @@ Job {
   Storage = DDS-4
   Messages = Standard
   Pool = Default
-  Where = /tmp/bacula-restores
+  Where = @tmpdir@/bacula-restores
 }
 
 
diff --git a/regress/win32/tests/2drive-incremental-2disk.cmd b/regress/win32/tests/2drive-incremental-2disk.cmd
index c8c33a8be4..bb5e0fae98 100644
--- a/regress/win32/tests/2drive-incremental-2disk.cmd
+++ b/regress/win32/tests/2drive-incremental-2disk.cmd
@@ -17,7 +17,7 @@ CALL scripts\prepare-two-disks
 CALL scripts\functions change_jobname localhost-fd %JobName%
 CALL scripts\functions start_test
 
-ECHO %CD:\=/%/tmp/build >\tmp\file-list
+ECHO %CD:\=/%/tmp/build >tmp\file-list
 IF NOT EXIST tmp\build MKDIR tmp\build
 COPY build\src\dird\*.c tmp\build >nul 2>&1
 
diff --git a/regress/win32/tests/auto-label-test.cmd b/regress/win32/tests/auto-label-test.cmd
index 218ded6d07..232b2c8995 100644
--- a/regress/win32/tests/auto-label-test.cmd
+++ b/regress/win32/tests/auto-label-test.cmd
@@ -8,7 +8,7 @@ SET JobName=AutoLabel
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 COPY bin\bacula-dir.conf tmp\1
 sed -e "s;# Label Format;  Label Format;" tmp\1 >bin\bacula-dir.conf
diff --git a/regress/win32/tests/backup-bacula-test.bscr b/regress/win32/tests/backup-bacula-test.bscr
index c6c22e9dae..ec4edaee8c 100644
--- a/regress/win32/tests/backup-bacula-test.bscr
+++ b/regress/win32/tests/backup-bacula-test.bscr
@@ -2,6 +2,7 @@
 messages
 @@out@ tmp/log1.out
 label volume=TestVolume001
+1
 @#setdebug level=100 storage=File
 run job=@JobName@ yes
 status storage=File
diff --git a/regress/win32/tests/bextract-test.cmd b/regress/win32/tests/bextract-test.cmd
index c119764c5e..ddabbdeeaa 100644
--- a/regress/win32/tests/bextract-test.cmd
+++ b/regress/win32/tests/bextract-test.cmd
@@ -9,7 +9,7 @@ SET JobName=bextract
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
@@ -20,7 +20,7 @@ CALL scripts\functions run_bacula
 CALL scripts\functions check_for_zombie_jobs storage=File1
 CALL scripts\functions stop_bacula
 
-MKDIR %CD%\tmp\bacula-restores
+MKDIR tmp\bacula-restores
 bin\bextract -b working/restore.bsr -c bin/bacula-sd.conf %CD:\=/%/tmp %CD:\=/%/tmp/bacula-restores 2>&1 >nul
 SET rstat=%ERRORLEVEL%
 grep "^  Termination: *Backup OK" tmp\log1.out 2>&1 >nul
diff --git a/regress/win32/tests/bscan-test.cmd b/regress/win32/tests/bscan-test.cmd
index 5b71db8c1a..0a9f38e73e 100644
--- a/regress/win32/tests/bscan-test.cmd
+++ b/regress/win32/tests/bscan-test.cmd
@@ -11,7 +11,7 @@ SET JobName=bscan
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
@@ -25,7 +25,7 @@ CALL scripts\functions stop_bacula
 ECHO volume=TestVolume001^|TestVolume002 >tmp\bscan.bsr
 
 IF %debug% EQU 1 (
-   bin\bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf %CD:\=/%/tmp | tools\tee tmp\log.out
+   bin\bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf %CD:\=/%/tmp | tee tmp\log.out
 ) ELSE (
    bin\bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf %CD:\=/%/tmp >nul 2>&1
 )
diff --git a/regress/win32/tests/bsr-opt-test.cmd b/regress/win32/tests/bsr-opt-test.cmd
index 9f816ab084..22b38bbba2 100644
--- a/regress/win32/tests/bsr-opt-test.cmd
+++ b/regress/win32/tests/bsr-opt-test.cmd
@@ -11,7 +11,7 @@ SET JobName=bsr-opt
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/compressed-test.cmd b/regress/win32/tests/compressed-test.cmd
index 2097c6124f..490783824d 100644
--- a/regress/win32/tests/compressed-test.cmd
+++ b/regress/win32/tests/compressed-test.cmd
@@ -8,7 +8,7 @@ SET JobName=compressed
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname CompressedTest %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/concurrent-jobs-test.cmd b/regress/win32/tests/concurrent-jobs-test.cmd
index 9c36b48c7e..05e7625844 100644
--- a/regress/win32/tests/concurrent-jobs-test.cmd
+++ b/regress/win32/tests/concurrent-jobs-test.cmd
@@ -8,15 +8,15 @@ SET JobName=concurrent-jobs
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/tmp/largefile >\tmp\file-list
+ECHO %CD:\=/%/tmp/largefile >tmp\file-list
 ECHO Creating a 50MB file with bacula-dir data ...
-tools\dd if=bin/bacula-dir.exe of=%CD:\=/%/tmp/1 bs=1024 count=512 >nul 2>&1
-COPY /b %CD%\tmp\1+%CD%\tmp\1+%CD%\tmp\1+%CD%\tmp\1 %CD%\tmp\2 >nul 2>&1
-DEL %CD%\tmp\1
-COPY /b %CD%\tmp\2+%CD%\tmp\2+%CD%\tmp\2+%CD%\tmp\2+%CD%\tmp\2 %CD%\tmp\3 >nul 2>&1
-DEL %CD%\tmp\2
-COPY /b %CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3 %CD%\tmp\largefile >nul 2>&1
-DEL %CD%\tmp\3
+dd if=bin/bacula-dir.exe of=%CD:\=/%/tmp/1 bs=1024 count=512 >nul 2>&1
+COPY /b tmp\1+tmp\1+tmp\1+tmp\1 tmp\2 >nul 2>&1
+DEL tmp\1
+COPY /b tmp\2+tmp\2+tmp\2+tmp\2+tmp\2 tmp\3 >nul 2>&1
+DEL tmp\2
+COPY /b tmp\3+tmp\3+tmp\3+tmp\3+tmp\3 tmp\largefile >nul 2>&1
+DEL tmp\3
 
 ECHO largefile created
 
diff --git a/regress/win32/tests/differential-test.cmd b/regress/win32/tests/differential-test.cmd
index 6ffdff055c..9707a33ac7 100644
--- a/regress/win32/tests/differential-test.cmd
+++ b/regress/win32/tests/differential-test.cmd
@@ -8,7 +8,7 @@ SET JobName=differential
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/tmp/build >\tmp\file-list
+ECHO %CD:\=/%/tmp/build >tmp\file-list
 MKDIR tmp\build
 COPY build\src\dird\*.c tmp\build >nul 2>&1
 
diff --git a/regress/win32/tests/four-concurrent-jobs-test.cmd b/regress/win32/tests/four-concurrent-jobs-test.cmd
index 0530baa8f0..36e3efe1a1 100644
--- a/regress/win32/tests/four-concurrent-jobs-test.cmd
+++ b/regress/win32/tests/four-concurrent-jobs-test.cmd
@@ -7,7 +7,7 @@ SET JobName=Four-concurrent-jobs
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/four-jobs-test.2.bscr b/regress/win32/tests/four-jobs-test.2.bscr
index 02fdc49786..9d5113e591 100644
--- a/regress/win32/tests/four-jobs-test.2.bscr
+++ b/regress/win32/tests/four-jobs-test.2.bscr
@@ -1,8 +1,7 @@
 @output nul
 messages
 @@out@  tmp/log1.out
-run job=@JobName@
-yes
+run job=@JobName@ yes
 wait
 messages
 quit
diff --git a/regress/win32/tests/four-jobs-test.3.bscr b/regress/win32/tests/four-jobs-test.3.bscr
index 6da93295f1..79c1d7a0d4 100644
--- a/regress/win32/tests/four-jobs-test.3.bscr
+++ b/regress/win32/tests/four-jobs-test.3.bscr
@@ -1,7 +1,6 @@
 @output nul
 messages
 @output tmp/log1.out
-label storage=File volume=TestVolume001
 run job=@JobName@ yes
 wait
 messages
diff --git a/regress/win32/tests/four-jobs-test.4.bscr b/regress/win32/tests/four-jobs-test.4.bscr
index 6da93295f1..79c1d7a0d4 100644
--- a/regress/win32/tests/four-jobs-test.4.bscr
+++ b/regress/win32/tests/four-jobs-test.4.bscr
@@ -1,7 +1,6 @@
 @output nul
 messages
 @output tmp/log1.out
-label storage=File volume=TestVolume001
 run job=@JobName@ yes
 wait
 messages
diff --git a/regress/win32/tests/four-jobs-test.cmd b/regress/win32/tests/four-jobs-test.cmd
index 72b00e0210..6301d74d16 100644
--- a/regress/win32/tests/four-jobs-test.cmd
+++ b/regress/win32/tests/four-jobs-test.cmd
@@ -9,7 +9,7 @@ SET JobName=SpanVol
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >${cwd}/tmp/file-list
+ECHO %CD:\=/%/build >tmp/file-list
 
 CALL scripts\functions change_jobname CompressedTest %JobName%
 CALL scripts\functions start_test
@@ -22,8 +22,8 @@ CALL scripts\functions check_for_zombie_jobs storage=File
 ECHO Backup 1 done
 
 REM make some files for the incremental to pick up
-tools\touch %CD:\=/%/build/src/dird/*.c
-tools\touch %CD:\=/%/build/src/lib/*.c
+touch %CD:\=/%/build/src/dird/*.c
+touch %CD:\=/%/build/src/lib/*.c
    
 REM
 REM run a second job
@@ -35,8 +35,8 @@ CALL scripts\functions check_for_zombie_jobs storage=File
 
 ECHO Backup 2 done
 
-tools\touch %CD:\=/%/build/src/dird/*.c
-tools\touch %CD:\=/%/build/src/lib/*.c
+touch %CD:\=/%/build/src/dird/*.c
+touch %CD:\=/%/build/src/lib/*.c
 
 REM
 REM run a third job
@@ -49,7 +49,7 @@ CALL scripts\functions check_for_zombie_jobs storage=File
 ECHO Backup 3 done
 
 REM make some files for the incremental to pick up
-tools\touch %CD:\=/%/build/src/lib/*.c
+touch %CD:\=/%/build/src/lib/*.c
 
 REM
 REM run a fourth job
diff --git a/regress/win32/tests/incremental-2disk.cmd b/regress/win32/tests/incremental-2disk.cmd
index a51fc8ad05..e7d874d3ed 100644
--- a/regress/win32/tests/incremental-2disk.cmd
+++ b/regress/win32/tests/incremental-2disk.cmd
@@ -20,7 +20,7 @@ CALL bin\grant_bacula_privileges >nul 2>&1
 CALL scripts\copy-2disk-confs >nul 2>&1
 CALL scripts\prepare-two-disks
 
-ECHO %CD:\=/%/tmp/build >\tmp\file-list
+ECHO %CD:\=/%/tmp/build >tmp\file-list
 IF NOT EXIST tmp\build MKDIR tmp\build
 
 COPY build\src\dird\*.c tmp\build >nul 2>&1
diff --git a/regress/win32/tests/incremental-2tape.cmd b/regress/win32/tests/incremental-2tape.cmd
index 2a646a0edd..8aff92fc09 100644
--- a/regress/win32/tests/incremental-2tape.cmd
+++ b/regress/win32/tests/incremental-2tape.cmd
@@ -21,7 +21,7 @@ CALL grant_bacula_privileges >nul 2>&1
 
 CALL scripts\copy-2tape-confs
 CALL scripts\cleanup-2tape
-ECHO %CD:\=/%/tmp/build >\tmp\file-list
+ECHO %CD:\=/%/tmp/build >tmp\file-list
 IF NOT EXIST tmp\build MKDIR tmp\build
 COPY build\src\dird\*.c tmp\build
 ECHO %CD:\=/%/tmp/build/ficheriro1.txt>tmp\restore-list
diff --git a/regress/win32/tests/incremental-test.cmd b/regress/win32/tests/incremental-test.cmd
index baf5bd3729..0567d238dd 100644
--- a/regress/win32/tests/incremental-test.cmd
+++ b/regress/win32/tests/incremental-test.cmd
@@ -8,7 +8,7 @@ SET JobName=Incremental
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/tmp/build>${cwd}/tmp/file-list
+ECHO %CD:\=/%/tmp/build>tmp/file-list
 
 MKDIR tmp\build
 COPY build\src\dird\*.c tmp\build >nul 2>&1
diff --git a/regress/win32/tests/migration-job-test.cmd b/regress/win32/tests/migration-job-test.cmd
index d851fdeea6..cc51dbafc2 100644
--- a/regress/win32/tests/migration-job-test.cmd
+++ b/regress/win32/tests/migration-job-test.cmd
@@ -14,7 +14,7 @@ CALL config_out
 CALL scripts\cleanup
 CALL scripts\copy-migration-confs
 CALL scripts\prepare-two-disks
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/migration-jobspan-test.cmd b/regress/win32/tests/migration-jobspan-test.cmd
index e21a19aaf2..23a40436f5 100644
--- a/regress/win32/tests/migration-jobspan-test.cmd
+++ b/regress/win32/tests/migration-jobspan-test.cmd
@@ -17,10 +17,10 @@ CALL scripts\cleanup
 CALL scripts\copy-migration-confs
 CALL scripts\prepare-two-disks
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 COPY bin\bacula-sd.conf tmp\1
-sed "s;# Maximum File Size;  Maximum File Size;" %CD%\tmp\1 >%CD%\bin\bacula-sd.conf
+sed "s;# Maximum File Size;  Maximum File Size;" tmp\1 >bin\bacula-sd.conf
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/migration-occupancy-test.cmd b/regress/win32/tests/migration-occupancy-test.cmd
index d68dac563d..4f8603d8d7 100644
--- a/regress/win32/tests/migration-occupancy-test.cmd
+++ b/regress/win32/tests/migration-occupancy-test.cmd
@@ -14,7 +14,7 @@ CALL config_out
 CALL scripts\cleanup
 CALL scripts\copy-migration-confs
 CALL scripts\prepare-two-disks
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/migration-time-test.cmd b/regress/win32/tests/migration-time-test.cmd
index 473ebe6b5e..c8ea183bea 100644
--- a/regress/win32/tests/migration-time-test.cmd
+++ b/regress/win32/tests/migration-time-test.cmd
@@ -15,7 +15,7 @@ CALL scripts\cleanup
 CALL scripts\copy-migration-confs
 CALL scripts\prepare-two-disks
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/migration-volume-test.cmd b/regress/win32/tests/migration-volume-test.cmd
index 86505d46a6..6ca53c722b 100644
--- a/regress/win32/tests/migration-volume-test.cmd
+++ b/regress/win32/tests/migration-volume-test.cmd
@@ -15,7 +15,7 @@ CALL scripts\cleanup
 CALL scripts\copy-migration-confs
 CALL scripts\prepare-two-disks
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 REM COPY bin\bacula-sd.conf tmp\1
 REM sed "s;# Maximum File Size;  Maximum File Size;" tmp\1 >bin\bacula-sd.conf
diff --git a/regress/win32/tests/query-test.cmd b/regress/win32/tests/query-test.cmd
index d919bbea87..ec14124393 100644
--- a/regress/win32/tests/query-test.cmd
+++ b/regress/win32/tests/query-test.cmd
@@ -9,7 +9,7 @@ SET JobName=query
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/tmp/build >\tmp\file-list
+ECHO %CD:\=/%/tmp/build >tmp\file-list
 MKDIR tmp\build
 COPY build\src\dird\*.c tmp\build >nul 2>&1
 ECHO %CD:\=/%/tmp/build/ficheriro1.txt>tmp\restore-list
diff --git a/regress/win32/tests/recycle-test.cmd b/regress/win32/tests/recycle-test.cmd
index b006fe482f..70b481b15b 100644
--- a/regress/win32/tests/recycle-test.cmd
+++ b/regress/win32/tests/recycle-test.cmd
@@ -10,7 +10,7 @@ SET JobName=Recycle
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/restore-by-file-test.cmd b/regress/win32/tests/restore-by-file-test.cmd
index 669196648a..5bc52e81bf 100644
--- a/regress/win32/tests/restore-by-file-test.cmd
+++ b/regress/win32/tests/restore-by-file-test.cmd
@@ -9,7 +9,7 @@ SET JobName=restorebyfile
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/tmp/build >\tmp\file-list
+ECHO %CD:\=/%/tmp/build >tmp\file-list
 MKDIR tmp\build
 COPY build\src\dird\*.c tmp\build >nul 2>&1
 DIR /b tmp\build >tmp\1
diff --git a/regress/win32/tests/restore-disk-seek-test.cmd b/regress/win32/tests/restore-disk-seek-test.cmd
index 6fdfdbd60f..bfbe94b70c 100644
--- a/regress/win32/tests/restore-disk-seek-test.cmd
+++ b/regress/win32/tests/restore-disk-seek-test.cmd
@@ -11,7 +11,7 @@ SET JobName=restore-disk-seek
 CALL scripts\functions set_debug 1
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/tmp/build >\tmp\file-list
+ECHO %CD:\=/%/tmp/build >tmp\file-list
 
 IF EXIST tmp\build RD /s /q  tmp\build
 MKDIR tmp\build
diff --git a/regress/win32/tests/restore2-by-file-test.cmd b/regress/win32/tests/restore2-by-file-test.cmd
index cba7ea35b1..284d1a6041 100644
--- a/regress/win32/tests/restore2-by-file-test.cmd
+++ b/regress/win32/tests/restore2-by-file-test.cmd
@@ -9,8 +9,8 @@ SET JobName=restore2byfile
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
-sed -e "s;^;%CD:\=/%;" scripts/flist >tmp\restore2-list
+ECHO %CD:\=/%/build >tmp\file-list
+sed -e "s;^;%CD:\=/%;" scripts\flist >tmp\restore2-list
 
 CALL scripts\functions change_jobname CompressedTest %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/runscript-test b/regress/win32/tests/runscript-test
index ef3c8b8d10..7da23df485 100644
--- a/regress/win32/tests/runscript-test
+++ b/regress/win32/tests/runscript-test
@@ -20,6 +20,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 label volume=TestVolume001
+1
 @#setdebug level=100 storage=File
 @output ${cwd}/tmp/log.RUN2.out
 run job=RUN_FD_WARNING yes
diff --git a/regress/win32/tests/scratch-pool-test.cmd b/regress/win32/tests/scratch-pool-test.cmd
index d8e88f400c..fabc302ed2 100644
--- a/regress/win32/tests/scratch-pool-test.cmd
+++ b/regress/win32/tests/scratch-pool-test.cmd
@@ -25,7 +25,7 @@ CALL scripts\cleanup
 CALL scripts\copy-2disk-confs >nul 2>&1
 CALL scripts\prepare-two-disks
  
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 COPY bin\bacula-sd.conf tmp\1 >nul 2>&1
 sed -e "s;# Maximum File Size;  Maximum File Size;g" tmp\1 >bin\bacula-sd.conf
diff --git a/regress/win32/tests/six-vol-test.cmd b/regress/win32/tests/six-vol-test.cmd
index ab3ca0559b..8cd87ab81a 100644
--- a/regress/win32/tests/six-vol-test.cmd
+++ b/regress/win32/tests/six-vol-test.cmd
@@ -9,17 +9,17 @@ CALL scripts\functions set_debug 0
 
 CALL scripts\cleanup
 CALL scripts\copy-testa-confs >nul 2>&1
-ECHO %CD:\=/%/tmp/largefile >\tmp\file-list
+ECHO %CD:\=/%/tmp/largefile >tmp\file-list
 
 ECHO Creating a 60MB file with bacula-dir data ...
-tools\dd if=bin/bacula-dir.exe of=%CD:\=/%/tmp/1 bs=1024 count=500 >nul 2>&1
-COPY /b %CD%\tmp\1+%CD%\tmp\1+%CD%\tmp\1+%CD%\tmp\1+%CD%\tmp\1 %CD%\tmp\2 >nul 2>&1
-DEL %CD%\tmp\1
-COPY /b %CD%\tmp\2+%CD%\tmp\2 %CD%\tmp\3 >nul 2>&1
-DEL %CD%\tmp\2
-COPY /b %CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3 %CD%\tmp\4 >nul 2>&1
-COPY /b %CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\3+%CD%\tmp\4 %CD%\tmp\largefile >nul 2>&1
-DEL %CD%\tmp\3 %CD%\tmp\4
+dd if=bin/bacula-dir.exe of=%CD:\=/%/tmp/1 bs=1024 count=500 >nul 2>&1
+COPY /b tmp\1+tmp\1+tmp\1+tmp\1+tmp\1 tmp\2 >nul 2>&1
+DEL tmp\1
+COPY /b tmp\2+tmp\2 tmp\3 >nul 2>&1
+DEL tmp\2
+COPY /b tmp\3+tmp\3+tmp\3+tmp\3+tmp\3+tmp\3 tmp\4 >nul 2>&1
+COPY /b tmp\3+tmp\3+tmp\3+tmp\3+tmp\3+tmp\4 tmp\largefile >nul 2>&1
+DEL tmp\3 tmp\4
 
 CALL scripts\functions change_jobname MultiVol %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/span-vol-test.cmd b/regress/win32/tests/span-vol-test.cmd
index 52cbaffb77..95c06edfa0 100644
--- a/regress/win32/tests/span-vol-test.cmd
+++ b/regress/win32/tests/span-vol-test.cmd
@@ -10,7 +10,7 @@ SET JobName=SpanVol
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/sparse-compressed-test.cmd b/regress/win32/tests/sparse-compressed-test.cmd
index e8b701dcf1..ddc005d2bb 100644
--- a/regress/win32/tests/sparse-compressed-test.cmd
+++ b/regress/win32/tests/sparse-compressed-test.cmd
@@ -8,7 +8,7 @@ SET JobName=Sparse-conpressed
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions start_test
 
diff --git a/regress/win32/tests/sparse-test.cmd b/regress/win32/tests/sparse-test.cmd
index a8ba5d1680..cf14f8cccc 100644
--- a/regress/win32/tests/sparse-test.cmd
+++ b/regress/win32/tests/sparse-test.cmd
@@ -8,7 +8,7 @@ SET JobName=SparseTest
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions start_test
 
diff --git a/regress/win32/tests/two-jobs-test.cmd b/regress/win32/tests/two-jobs-test.cmd
index 3964e90d16..1b0e972e35 100644
--- a/regress/win32/tests/two-jobs-test.cmd
+++ b/regress/win32/tests/two-jobs-test.cmd
@@ -8,7 +8,7 @@ SET JobName=Two-Jobs
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname CompressedTest %JobName%
 CALL scripts\functions start_test
@@ -19,7 +19,7 @@ CALL scripts\functions run_bacula
 CALL scripts\functions check_for_zombie_jobs storage=File 
 
 ECHO Backup 1 done
-tools\touch build\src\dird\*.c
+touch build\src\dird\*.c
 
 REM
 REM run a second job
diff --git a/regress/win32/tests/two-pool-test.cmd b/regress/win32/tests/two-pool-test.cmd
index 2bf0028546..7aa9edb9b8 100644
--- a/regress/win32/tests/two-pool-test.cmd
+++ b/regress/win32/tests/two-pool-test.cmd
@@ -21,7 +21,7 @@ CALL scripts\prepare-two-disks
  
 REM Make a relatively large backup set 5 x source code directory
 REM  Reduced to 1 for portable
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions start_test
 
diff --git a/regress/win32/tests/two-vol-test.cmd b/regress/win32/tests/two-vol-test.cmd
index ce59794572..dcdb10a265 100644
--- a/regress/win32/tests/two-vol-test.cmd
+++ b/regress/win32/tests/two-vol-test.cmd
@@ -8,7 +8,7 @@ SET JobName=TwoVol
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test
diff --git a/regress/win32/tests/two-volume-tape.cmd b/regress/win32/tests/two-volume-tape.cmd
index 62e80ecaa9..2a16cd08db 100644
--- a/regress/win32/tests/two-volume-tape.cmd
+++ b/regress/win32/tests/two-volume-tape.cmd
@@ -18,7 +18,7 @@ CALL scripts\cleanup
 CALL scripts\copy-2tape-confs
 CALL scripts\prepare-two-tapes
  
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 COPY bin\bacula-sd.conf tmp\1
 sed -e "s%# Maximum File Size%  Maximum File Size%g" >bin\bacula-sd.conf
diff --git a/regress/win32/tests/two-volume-test.cmd b/regress/win32/tests/two-volume-test.cmd
index 9bfe9c88da..4151cce97e 100644
--- a/regress/win32/tests/two-volume-test.cmd
+++ b/regress/win32/tests/two-volume-test.cmd
@@ -15,7 +15,7 @@ CALL scripts\cleanup
 CALL scripts\copy-2disk-confs >nul 2>&1
 CALL scripts\prepare-two-disks
  
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 COPY bin\bacula-sd.conf tmp\1
 sed -e "s;# Maximum File Size;  Maximum File Size;g" tmp\1 >bin\bacula-sd.conf
diff --git a/regress/win32/tests/verify-vol-test.cmd b/regress/win32/tests/verify-vol-test.cmd
index 377fb3428f..a0c844c07a 100644
--- a/regress/win32/tests/verify-vol-test.cmd
+++ b/regress/win32/tests/verify-vol-test.cmd
@@ -8,7 +8,7 @@ SET JobName=VerifyVol
 CALL scripts\functions set_debug 0
 CALL scripts\functions copy_test_confs
 
-ECHO %CD:\=/%/build >\tmp\file-list
+ECHO %CD:\=/%/build >tmp\file-list
 
 CALL scripts\functions change_jobname NightlySave %JobName%
 CALL scripts\functions start_test