From 4be6ead8f2d00c79d2dc07177b87e196c9bdfafc Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@91ce42f0-d328-0410-95d8-f526ca767f89> Date: Thu, 4 Jan 2007 08:52:26 +0000 Subject: [PATCH] This commit was manufactured by cvs2svn to create tag 'Release-2.0.0'. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/tags/Release-2.0.0@3917 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/po/de.gmo | Bin 0 -> 479 bytes bacula/po/es.gmo | Bin 0 -> 426 bytes bacula/po/fr.gmo | Bin 0 -> 97375 bytes bacula/po/it.gmo | Bin 0 -> 470 bytes gui/bweb/cgi/bgraph.pl | 103 +----- regress/.cvsignore | 12 - regress/Makefile.in | 72 ---- regress/README | 126 ------- regress/all-non-root-2tape-tests | 12 - regress/all-non-root-tape-tests | 29 -- regress/all-non-root-tests | 52 --- regress/all-root-tests | 11 - regress/all-tape-and-file-tests | 7 - regress/all-tests | 8 - regress/config | 9 - regress/do_all | 11 - regress/do_all_tapes | 3 - regress/do_file | 6 - regress/endtime | 12 - regress/file | 2 - regress/freebsd.conf | 31 -- regress/kern.conf | 35 -- regress/misc-tests | 2 - regress/prototype.conf | 52 --- regress/run | 3 - regress/scripts/.cvsignore | 26 -- regress/scripts/bacula-dir-migration.conf.in | 229 ------------ regress/scripts/bacula-dir-tape.conf.in | 226 ------------ regress/scripts/bacula-dir-win32-tape.conf.in | 144 -------- .../scripts/bacula-dir.conf.testrunscript.in | 159 -------- regress/scripts/bacula-sd-2disk-drive.conf.in | 75 ---- regress/scripts/bacula-sd-2disk.conf.in | 62 ---- regress/scripts/bacula-sd-2drive.conf.in | 75 ---- regress/scripts/bacula-sd-2tape.conf.in | 61 ---- regress/scripts/bacula-sd-migration.conf.in | 72 ---- regress/scripts/bacula-sd-tape.conf.in | 54 --- regress/scripts/bacula-sd.conf.in | 74 ---- regress/scripts/check_for_zombie_jobs | 51 --- regress/scripts/cleanup | 22 -- regress/scripts/cleanup-2drive.in | 44 --- regress/scripts/cleanup-2tape.in | 30 -- regress/scripts/cleanup-tape.in | 8 - regress/scripts/copy-2disk-confs | 12 - regress/scripts/copy-2disk-drive-confs | 10 - regress/scripts/copy-2drive-confs | 15 - regress/scripts/copy-2tape-confs | 15 - regress/scripts/copy-confs | 11 - regress/scripts/copy-crypto-confs | 6 - regress/scripts/copy-migration-confs | 8 - regress/scripts/copy-tape-confs | 11 - regress/scripts/copy-test-confs | 11 - regress/scripts/copy-testa-confs | 11 - regress/scripts/copy-win32-confs | 11 - regress/scripts/crypto-bacula-fd.conf.in | 36 -- regress/scripts/cryptokeypair.pem | 23 -- regress/scripts/do_sed | 74 ---- regress/scripts/exclude-dev-test | 5 - regress/scripts/exclude-etc-test | 1 - regress/scripts/exclude-lib-test | 5 - regress/scripts/flist | 23 -- regress/scripts/freebsd_tape_options | 8 - regress/scripts/functions | 147 -------- regress/scripts/linux_osst_tape_options | 7 - regress/scripts/linux_tape_options | 1 - regress/scripts/new-test-bacula-dir.conf.in | 342 ------------------ regress/scripts/prepare-two-disks | 6 - regress/scripts/prepare-two-tapes.in | 14 - regress/scripts/regress-config | 24 -- regress/scripts/setup | 60 --- regress/scripts/test-bacula-dir.conf.in | 312 ---------------- regress/scripts/test-bacula-fd.conf.in | 33 -- regress/scripts/test-bacula-sd.conf.in | 107 ------ regress/scripts/test-console.conf.in | 10 - regress/scripts/testa-bacula-dir.conf.in | 147 -------- regress/scripts/win32-bacula-dir-tape.conf.in | 159 -------- regress/scripts/win32-bacula-fd.conf | 33 -- regress/scripts/win32-bacula-sd-tape.conf | 54 --- regress/starttime | 6 - regress/tape | 2 - regress/tests/.cvsignore | 2 - regress/tests/2drive-incremental-2disk | 114 ------ regress/tests/2drive-incremental-2tape | 112 ------ regress/tests/auto-label-test | 64 ---- regress/tests/backup-bacula-tape | 117 ------ regress/tests/backup-bacula-test | 62 ---- regress/tests/backup-win32-tape | 49 --- regress/tests/bextract-test | 53 --- regress/tests/bscan-fast-tape | 89 ----- regress/tests/bscan-tape | 142 -------- regress/tests/bscan-test | 84 ----- regress/tests/bsr-opt-test | 81 ----- regress/tests/btape-fill-full-tape | 35 -- regress/tests/btape-fill-tape | 38 -- regress/tests/compress-encrypt-test | 50 --- regress/tests/compressed-test | 50 --- regress/tests/concurrent-jobs-test | 67 ---- regress/tests/data-encrypt-test | 55 --- regress/tests/dev-test-root | 85 ----- regress/tests/differential-test | 88 ----- regress/tests/eot-fail-tape | 51 --- regress/tests/etc-test-root | 70 ---- regress/tests/fixed-block-size-tape | 62 ---- regress/tests/four-concurrent-jobs-tape | 56 --- regress/tests/four-concurrent-jobs-test | 76 ---- regress/tests/four-jobs-tape | 153 -------- regress/tests/four-jobs-test | 128 ------- regress/tests/gigaslam-sparse-test | 64 ---- regress/tests/hardlink-test | 66 ---- regress/tests/incremental-2disk | 92 ----- regress/tests/incremental-2tape | 110 ------ regress/tests/incremental-tape | 76 ---- regress/tests/incremental-test | 170 --------- regress/tests/lib-tape-root | 67 ---- regress/tests/lib-test-root | 76 ---- regress/tests/migration-job-test | 73 ---- regress/tests/migration-jobspan-test | 83 ----- regress/tests/migration-occupancy-test | 72 ---- regress/tests/migration-time-test | 79 ---- regress/tests/migration-volume-test | 106 ------ regress/tests/query-test | 119 ------ regress/tests/recycle-test | 81 ----- regress/tests/relabel-tape | 94 ----- regress/tests/restore-by-file-tape | 101 ------ regress/tests/restore-by-file-test | 57 --- regress/tests/restore-disk-seek-test | 94 ----- regress/tests/restore-seek-tape | 93 ----- regress/tests/restore2-by-file-test | 50 --- regress/tests/runscript-test | 90 ----- regress/tests/scratch-pool-test | 74 ---- regress/tests/six-vol-test | 56 --- regress/tests/small-file-size-tape | 50 --- regress/tests/span-vol-test | 57 --- regress/tests/sparse-compressed-test | 44 --- regress/tests/sparse-encrypt-test | 65 ---- regress/tests/sparse-test | 47 --- regress/tests/test0 | 3 - regress/tests/truncate-bug-tape | 87 ----- regress/tests/two-jobs-test | 80 ---- regress/tests/two-pool-tape | 82 ----- regress/tests/two-pool-test | 75 ---- regress/tests/two-vol-test | 47 --- regress/tests/two-volume-tape | 78 ---- regress/tests/two-volume-test | 61 ---- regress/tests/usr-tape-root | 62 ---- regress/tests/verify-vol-tape | 50 --- regress/tests/verify-vol-test | 51 --- regress/tests/weird-files-test | 69 ---- regress/tests/weird-files2-test | 80 ---- regress/tests/win32-backup-tape | 49 --- regress/tests/win32-to-linux-tape | 49 --- regress/weird-files.tar.gz | Bin 1711 -> 0 bytes regress/win32/all-non-root-2tape-tests.cmd | 11 - regress/win32/all-non-root-tape-tests.cmd | 26 -- regress/win32/all-non-root-tests.cmd | 48 --- regress/win32/all-root-tests.cmd | 10 - regress/win32/all-tape-and-file-tests.cmd | 5 - regress/win32/all-tests.cmd | 7 - regress/win32/config.cmd | 10 - regress/win32/make.cmd | 111 ------ regress/win32/prototype.conf | 31 -- .../scripts/bacula-dir-migration.conf.in | 229 ------------ regress/win32/scripts/bacula-dir-tape.conf.in | 226 ------------ .../scripts/bacula-dir-win32-tape.conf.in | 144 -------- .../scripts/bacula-dir.conf.testrunscript.in | 159 -------- .../scripts/bacula-sd-2disk-drive.conf.in | 75 ---- regress/win32/scripts/bacula-sd-2disk.conf.in | 62 ---- .../win32/scripts/bacula-sd-2drive.conf.in | 75 ---- regress/win32/scripts/bacula-sd-2tape.conf.in | 61 ---- .../win32/scripts/bacula-sd-migration.conf.in | 72 ---- regress/win32/scripts/bacula-sd-tape.conf.in | 54 --- regress/win32/scripts/bacula-sd.conf.in | 74 ---- regress/win32/scripts/bacula.cmd | 18 - .../win32/scripts/check_for_zombie_jobs.bscr | 8 - .../win32/scripts/check_for_zombie_jobs.cmd | 41 --- regress/win32/scripts/cleanup-2drive.cmd.in | 43 --- regress/win32/scripts/cleanup-2tape.cmd.in | 29 -- regress/win32/scripts/cleanup-tape.cmd.in | 7 - regress/win32/scripts/cleanup.cmd | 23 -- regress/win32/scripts/copy-2disk-confs.cmd | 9 - .../win32/scripts/copy-2disk-drive-confs.cmd | 6 - regress/win32/scripts/copy-2drive-confs.cmd | 10 - regress/win32/scripts/copy-2tape-confs.cmd | 10 - regress/win32/scripts/copy-confs.cmd | 7 - regress/win32/scripts/copy-crypto-confs.cmd | 5 - .../win32/scripts/copy-migration-confs.cmd | 7 - regress/win32/scripts/copy-tape-confs.cmd | 7 - regress/win32/scripts/copy-test-confs.cmd | 7 - regress/win32/scripts/copy-testa-confs.cmd | 7 - regress/win32/scripts/copy-win32-confs.cmd | 7 - .../win32/scripts/crypto-bacula-fd.conf.in | 36 -- regress/win32/scripts/cryptokeypair.pem | 23 -- regress/win32/scripts/disk-changer.cmd | 201 ---------- regress/win32/scripts/do_sed.cmd | 73 ---- regress/win32/scripts/exclude-dev-test | 5 - regress/win32/scripts/exclude-etc-test | 1 - regress/win32/scripts/exclude-lib-test | 5 - regress/win32/scripts/flist | 23 -- regress/win32/scripts/functions.cmd | 131 ------- regress/win32/scripts/install_bacula.cmd | 76 ---- .../win32/scripts/new-test-bacula-dir.conf.in | 326 ----------------- regress/win32/scripts/prepare-two-disks.cmd | 5 - .../win32/scripts/prepare-two-tapes.cmd.in | 13 - regress/win32/scripts/setup.cmd | 55 --- regress/win32/scripts/test-bacula-dir.conf.in | 312 ---------------- regress/win32/scripts/test-bacula-fd.conf.in | 33 -- regress/win32/scripts/test-bacula-sd.conf.in | 107 ------ regress/win32/scripts/test-console.conf.in | 10 - .../win32/scripts/testa-bacula-dir.conf.in | 147 -------- .../scripts/win32-bacula-dir-tape.conf.in | 159 -------- regress/win32/scripts/win32_tape_options | 1 - .../tests/2drive-incremental-2disk.1.bscr | 20 - .../tests/2drive-incremental-2disk.2.bscr | 25 -- .../win32/tests/2drive-incremental-2disk.cmd | 57 --- regress/win32/tests/2drive-incremental-2tape | 112 ------ regress/win32/tests/auto-label-test.bscr | 35 -- regress/win32/tests/auto-label-test.cmd | 27 -- regress/win32/tests/backup-bacula-tape | 117 ------ regress/win32/tests/backup-bacula-test.bscr | 36 -- regress/win32/tests/backup-bacula-test.cmd | 24 -- regress/win32/tests/backup-win32-tape | 49 --- regress/win32/tests/bextract-test.bscr | 21 -- regress/win32/tests/bextract-test.cmd | 29 -- regress/win32/tests/bscan-fast-tape | 89 ----- regress/win32/tests/bscan-tape | 142 -------- regress/win32/tests/bscan-test.1.bscr | 24 -- regress/win32/tests/bscan-test.2.bscr | 13 - regress/win32/tests/bscan-test.cmd | 42 --- regress/win32/tests/bsr-opt-test.bscr | 24 -- regress/win32/tests/bsr-opt-test.cmd | 57 --- regress/win32/tests/btape-fill-full-tape | 35 -- regress/win32/tests/btape-fill-tape | 38 -- regress/win32/tests/compressed-test.bscr | 23 -- regress/win32/tests/compressed-test.cmd | 24 -- regress/win32/tests/concurrent-jobs-test.bscr | 23 -- regress/win32/tests/concurrent-jobs-test.cmd | 35 -- regress/win32/tests/dev-test-root | 85 ----- regress/win32/tests/differential-test.1.bscr | 9 - regress/win32/tests/differential-test.2.bscr | 9 - regress/win32/tests/differential-test.3.bscr | 16 - regress/win32/tests/differential-test.cmd | 48 --- regress/win32/tests/eot-fail-tape | 51 --- regress/win32/tests/etc-test-root | 70 ---- regress/win32/tests/fixed-block-size-tape | 62 ---- regress/win32/tests/four-concurrent-jobs-tape | 56 --- .../tests/four-concurrent-jobs-test.bscr | 50 --- .../win32/tests/four-concurrent-jobs-test.cmd | 23 -- regress/win32/tests/four-jobs-tape | 153 -------- regress/win32/tests/four-jobs-test.1.bscr | 11 - regress/win32/tests/four-jobs-test.2.bscr | 8 - regress/win32/tests/four-jobs-test.3.bscr | 8 - regress/win32/tests/four-jobs-test.4.bscr | 8 - regress/win32/tests/four-jobs-test.5.bscr | 17 - regress/win32/tests/four-jobs-test.cmd | 74 ---- regress/win32/tests/hardlink-test | 66 ---- regress/win32/tests/incremental-2disk.1.bscr | 9 - regress/win32/tests/incremental-2disk.2.bscr | 21 -- regress/win32/tests/incremental-2disk.cmd | 55 --- regress/win32/tests/incremental-2tape.1.bscr | 9 - regress/win32/tests/incremental-2tape.2.bscr | 21 -- regress/win32/tests/incremental-2tape.cmd | 48 --- regress/win32/tests/incremental-tape | 76 ---- regress/win32/tests/incremental-test.1.bscr | 9 - regress/win32/tests/incremental-test.2.bscr | 9 - regress/win32/tests/incremental-test.3.bscr | 7 - regress/win32/tests/incremental-test.4.bscr | 7 - regress/win32/tests/incremental-test.5.bscr | 16 - regress/win32/tests/incremental-test.cmd | 91 ----- regress/win32/tests/lib-tape-root | 67 ---- regress/win32/tests/lib-test-root | 76 ---- regress/win32/tests/migration-job-test.cmd | 37 -- .../win32/tests/migration-jobspan-test.cmd | 42 --- .../win32/tests/migration-occupancy-test.cmd | 36 -- regress/win32/tests/migration-time-test.cmd | 37 -- regress/win32/tests/migration-volume-test.cmd | 40 -- regress/win32/tests/query-test.1.bscr | 9 - regress/win32/tests/query-test.2.bscr | 9 - regress/win32/tests/query-test.3.bscr | 46 --- regress/win32/tests/query-test.cmd | 48 --- regress/win32/tests/recycle-test.bscr | 51 --- regress/win32/tests/recycle-test.cmd | 26 -- regress/win32/tests/relabel-tape | 94 ----- regress/win32/tests/restore-by-file-tape | 101 ------ regress/win32/tests/restore-by-file-test.bscr | 20 - regress/win32/tests/restore-by-file-test.cmd | 30 -- .../win32/tests/restore-disk-seek-test.bscr | 23 -- .../win32/tests/restore-disk-seek-test.cmd | 55 --- .../win32/tests/restore2-by-file-test.bscr | 17 - regress/win32/tests/restore2-by-file-test.cmd | 31 -- regress/win32/tests/runscript-test | 90 ----- regress/win32/tests/scratch-pool-test.bscr | 25 -- regress/win32/tests/scratch-pool-test.cmd | 45 --- regress/win32/tests/six-vol-test.bscr | 19 - regress/win32/tests/six-vol-test.cmd | 36 -- regress/win32/tests/small-file-size-tape | 50 --- regress/win32/tests/span-vol-test.bscr | 27 -- regress/win32/tests/span-vol-test.cmd | 26 -- .../win32/tests/sparse-compressed-test.bscr | 17 - .../win32/tests/sparse-compressed-test.cmd | 23 -- regress/win32/tests/sparse-test.bscr | 20 - regress/win32/tests/sparse-test.cmd | 23 -- regress/win32/tests/test0.cmd | 2 - regress/win32/tests/truncate-bug-tape | 87 ----- regress/win32/tests/two-jobs-test.1.bscr | 14 - regress/win32/tests/two-jobs-test.2.bscr | 27 -- regress/win32/tests/two-jobs-test.cmd | 35 -- regress/win32/tests/two-pool-tape | 82 ----- regress/win32/tests/two-pool-test.bscr | 36 -- regress/win32/tests/two-pool-test.cmd | 37 -- regress/win32/tests/two-vol-test.bscr | 19 - regress/win32/tests/two-vol-test.cmd | 24 -- regress/win32/tests/two-volume-tape.1.bscr | 11 - regress/win32/tests/two-volume-tape.2.bscr | 12 - regress/win32/tests/two-volume-tape.cmd | 48 --- regress/win32/tests/two-volume-test.bscr | 21 -- regress/win32/tests/two-volume-test.cmd | 35 -- regress/win32/tests/usr-tape-root | 62 ---- regress/win32/tests/verify-vol-tape | 50 --- regress/win32/tests/verify-vol-test.bscr | 18 - regress/win32/tests/verify-vol-test.cmd | 29 -- regress/win32/tests/weird-files-test | 69 ---- regress/win32/tests/weird-files2-test | 80 ---- regress/win32/tests/win32-backup-tape | 49 --- regress/win32/tests/win32-to-linux-tape | 49 --- 323 files changed, 3 insertions(+), 17027 deletions(-) create mode 100644 bacula/po/de.gmo create mode 100644 bacula/po/es.gmo create mode 100644 bacula/po/fr.gmo create mode 100644 bacula/po/it.gmo delete mode 100644 regress/.cvsignore delete mode 100644 regress/Makefile.in delete mode 100644 regress/README delete mode 100755 regress/all-non-root-2tape-tests delete mode 100755 regress/all-non-root-tape-tests delete mode 100755 regress/all-non-root-tests delete mode 100755 regress/all-root-tests delete mode 100755 regress/all-tape-and-file-tests delete mode 100755 regress/all-tests delete mode 100755 regress/config delete mode 100755 regress/do_all delete mode 100755 regress/do_all_tapes delete mode 100755 regress/do_file delete mode 100755 regress/endtime delete mode 100755 regress/file delete mode 100644 regress/freebsd.conf delete mode 100644 regress/kern.conf delete mode 100644 regress/misc-tests delete mode 100644 regress/prototype.conf delete mode 100755 regress/run delete mode 100644 regress/scripts/.cvsignore delete mode 100644 regress/scripts/bacula-dir-migration.conf.in delete mode 100644 regress/scripts/bacula-dir-tape.conf.in delete mode 100644 regress/scripts/bacula-dir-win32-tape.conf.in delete mode 100644 regress/scripts/bacula-dir.conf.testrunscript.in delete mode 100644 regress/scripts/bacula-sd-2disk-drive.conf.in delete mode 100644 regress/scripts/bacula-sd-2disk.conf.in delete mode 100644 regress/scripts/bacula-sd-2drive.conf.in delete mode 100644 regress/scripts/bacula-sd-2tape.conf.in delete mode 100644 regress/scripts/bacula-sd-migration.conf.in delete mode 100644 regress/scripts/bacula-sd-tape.conf.in delete mode 100644 regress/scripts/bacula-sd.conf.in delete mode 100755 regress/scripts/check_for_zombie_jobs delete mode 100755 regress/scripts/cleanup delete mode 100755 regress/scripts/cleanup-2drive.in delete mode 100755 regress/scripts/cleanup-2tape.in delete mode 100755 regress/scripts/cleanup-tape.in delete mode 100755 regress/scripts/copy-2disk-confs delete mode 100755 regress/scripts/copy-2disk-drive-confs delete mode 100755 regress/scripts/copy-2drive-confs delete mode 100755 regress/scripts/copy-2tape-confs delete mode 100755 regress/scripts/copy-confs delete mode 100755 regress/scripts/copy-crypto-confs delete mode 100755 regress/scripts/copy-migration-confs delete mode 100755 regress/scripts/copy-tape-confs delete mode 100755 regress/scripts/copy-test-confs delete mode 100755 regress/scripts/copy-testa-confs delete mode 100755 regress/scripts/copy-win32-confs delete mode 100644 regress/scripts/crypto-bacula-fd.conf.in delete mode 100644 regress/scripts/cryptokeypair.pem delete mode 100755 regress/scripts/do_sed delete mode 100644 regress/scripts/exclude-dev-test delete mode 100644 regress/scripts/exclude-etc-test delete mode 100644 regress/scripts/exclude-lib-test delete mode 100644 regress/scripts/flist delete mode 100644 regress/scripts/freebsd_tape_options delete mode 100644 regress/scripts/functions delete mode 100644 regress/scripts/linux_osst_tape_options delete mode 100644 regress/scripts/linux_tape_options delete mode 100644 regress/scripts/new-test-bacula-dir.conf.in delete mode 100755 regress/scripts/prepare-two-disks delete mode 100755 regress/scripts/prepare-two-tapes.in delete mode 100755 regress/scripts/regress-config delete mode 100755 regress/scripts/setup delete mode 100644 regress/scripts/test-bacula-dir.conf.in delete mode 100644 regress/scripts/test-bacula-fd.conf.in delete mode 100644 regress/scripts/test-bacula-sd.conf.in delete mode 100644 regress/scripts/test-console.conf.in delete mode 100644 regress/scripts/testa-bacula-dir.conf.in delete mode 100644 regress/scripts/win32-bacula-dir-tape.conf.in delete mode 100644 regress/scripts/win32-bacula-fd.conf delete mode 100644 regress/scripts/win32-bacula-sd-tape.conf delete mode 100755 regress/starttime delete mode 100755 regress/tape delete mode 100644 regress/tests/.cvsignore delete mode 100755 regress/tests/2drive-incremental-2disk delete mode 100755 regress/tests/2drive-incremental-2tape delete mode 100755 regress/tests/auto-label-test delete mode 100755 regress/tests/backup-bacula-tape delete mode 100755 regress/tests/backup-bacula-test delete mode 100755 regress/tests/backup-win32-tape delete mode 100755 regress/tests/bextract-test delete mode 100755 regress/tests/bscan-fast-tape delete mode 100755 regress/tests/bscan-tape delete mode 100755 regress/tests/bscan-test delete mode 100755 regress/tests/bsr-opt-test delete mode 100755 regress/tests/btape-fill-full-tape delete mode 100755 regress/tests/btape-fill-tape delete mode 100755 regress/tests/compress-encrypt-test delete mode 100755 regress/tests/compressed-test delete mode 100755 regress/tests/concurrent-jobs-test delete mode 100755 regress/tests/data-encrypt-test delete mode 100755 regress/tests/dev-test-root delete mode 100755 regress/tests/differential-test delete mode 100755 regress/tests/eot-fail-tape delete mode 100755 regress/tests/etc-test-root delete mode 100755 regress/tests/fixed-block-size-tape delete mode 100755 regress/tests/four-concurrent-jobs-tape delete mode 100755 regress/tests/four-concurrent-jobs-test delete mode 100755 regress/tests/four-jobs-tape delete mode 100755 regress/tests/four-jobs-test delete mode 100755 regress/tests/gigaslam-sparse-test delete mode 100755 regress/tests/hardlink-test delete mode 100755 regress/tests/incremental-2disk delete mode 100755 regress/tests/incremental-2tape delete mode 100755 regress/tests/incremental-tape delete mode 100755 regress/tests/incremental-test delete mode 100755 regress/tests/lib-tape-root delete mode 100755 regress/tests/lib-test-root delete mode 100755 regress/tests/migration-job-test delete mode 100755 regress/tests/migration-jobspan-test delete mode 100755 regress/tests/migration-occupancy-test delete mode 100755 regress/tests/migration-time-test delete mode 100755 regress/tests/migration-volume-test delete mode 100755 regress/tests/query-test delete mode 100755 regress/tests/recycle-test delete mode 100755 regress/tests/relabel-tape delete mode 100755 regress/tests/restore-by-file-tape delete mode 100755 regress/tests/restore-by-file-test delete mode 100755 regress/tests/restore-disk-seek-test delete mode 100755 regress/tests/restore-seek-tape delete mode 100755 regress/tests/restore2-by-file-test delete mode 100755 regress/tests/runscript-test delete mode 100755 regress/tests/scratch-pool-test delete mode 100755 regress/tests/six-vol-test delete mode 100755 regress/tests/small-file-size-tape delete mode 100755 regress/tests/span-vol-test delete mode 100755 regress/tests/sparse-compressed-test delete mode 100755 regress/tests/sparse-encrypt-test delete mode 100755 regress/tests/sparse-test delete mode 100755 regress/tests/test0 delete mode 100755 regress/tests/truncate-bug-tape delete mode 100755 regress/tests/two-jobs-test delete mode 100755 regress/tests/two-pool-tape delete mode 100755 regress/tests/two-pool-test delete mode 100755 regress/tests/two-vol-test delete mode 100755 regress/tests/two-volume-tape delete mode 100755 regress/tests/two-volume-test delete mode 100755 regress/tests/usr-tape-root delete mode 100755 regress/tests/verify-vol-tape delete mode 100755 regress/tests/verify-vol-test delete mode 100755 regress/tests/weird-files-test delete mode 100755 regress/tests/weird-files2-test delete mode 100755 regress/tests/win32-backup-tape delete mode 100755 regress/tests/win32-to-linux-tape delete mode 100644 regress/weird-files.tar.gz delete mode 100644 regress/win32/all-non-root-2tape-tests.cmd delete mode 100644 regress/win32/all-non-root-tape-tests.cmd delete mode 100644 regress/win32/all-non-root-tests.cmd delete mode 100644 regress/win32/all-root-tests.cmd delete mode 100644 regress/win32/all-tape-and-file-tests.cmd delete mode 100644 regress/win32/all-tests.cmd delete mode 100644 regress/win32/config.cmd delete mode 100644 regress/win32/make.cmd delete mode 100644 regress/win32/prototype.conf delete mode 100644 regress/win32/scripts/bacula-dir-migration.conf.in delete mode 100644 regress/win32/scripts/bacula-dir-tape.conf.in delete mode 100644 regress/win32/scripts/bacula-dir-win32-tape.conf.in delete mode 100644 regress/win32/scripts/bacula-dir.conf.testrunscript.in delete mode 100644 regress/win32/scripts/bacula-sd-2disk-drive.conf.in delete mode 100644 regress/win32/scripts/bacula-sd-2disk.conf.in delete mode 100644 regress/win32/scripts/bacula-sd-2drive.conf.in delete mode 100644 regress/win32/scripts/bacula-sd-2tape.conf.in delete mode 100644 regress/win32/scripts/bacula-sd-migration.conf.in delete mode 100644 regress/win32/scripts/bacula-sd-tape.conf.in delete mode 100644 regress/win32/scripts/bacula-sd.conf.in delete mode 100644 regress/win32/scripts/bacula.cmd delete mode 100644 regress/win32/scripts/check_for_zombie_jobs.bscr delete mode 100644 regress/win32/scripts/check_for_zombie_jobs.cmd delete mode 100644 regress/win32/scripts/cleanup-2drive.cmd.in delete mode 100644 regress/win32/scripts/cleanup-2tape.cmd.in delete mode 100644 regress/win32/scripts/cleanup-tape.cmd.in delete mode 100644 regress/win32/scripts/cleanup.cmd delete mode 100644 regress/win32/scripts/copy-2disk-confs.cmd delete mode 100644 regress/win32/scripts/copy-2disk-drive-confs.cmd delete mode 100644 regress/win32/scripts/copy-2drive-confs.cmd delete mode 100644 regress/win32/scripts/copy-2tape-confs.cmd delete mode 100644 regress/win32/scripts/copy-confs.cmd delete mode 100644 regress/win32/scripts/copy-crypto-confs.cmd delete mode 100644 regress/win32/scripts/copy-migration-confs.cmd delete mode 100644 regress/win32/scripts/copy-tape-confs.cmd delete mode 100644 regress/win32/scripts/copy-test-confs.cmd delete mode 100644 regress/win32/scripts/copy-testa-confs.cmd delete mode 100644 regress/win32/scripts/copy-win32-confs.cmd delete mode 100644 regress/win32/scripts/crypto-bacula-fd.conf.in delete mode 100644 regress/win32/scripts/cryptokeypair.pem delete mode 100644 regress/win32/scripts/disk-changer.cmd delete mode 100644 regress/win32/scripts/do_sed.cmd delete mode 100644 regress/win32/scripts/exclude-dev-test delete mode 100644 regress/win32/scripts/exclude-etc-test delete mode 100644 regress/win32/scripts/exclude-lib-test delete mode 100644 regress/win32/scripts/flist delete mode 100644 regress/win32/scripts/functions.cmd delete mode 100644 regress/win32/scripts/install_bacula.cmd delete mode 100644 regress/win32/scripts/new-test-bacula-dir.conf.in delete mode 100644 regress/win32/scripts/prepare-two-disks.cmd delete mode 100644 regress/win32/scripts/prepare-two-tapes.cmd.in delete mode 100644 regress/win32/scripts/setup.cmd delete mode 100644 regress/win32/scripts/test-bacula-dir.conf.in delete mode 100644 regress/win32/scripts/test-bacula-fd.conf.in delete mode 100644 regress/win32/scripts/test-bacula-sd.conf.in delete mode 100644 regress/win32/scripts/test-console.conf.in delete mode 100644 regress/win32/scripts/testa-bacula-dir.conf.in delete mode 100644 regress/win32/scripts/win32-bacula-dir-tape.conf.in delete mode 100644 regress/win32/scripts/win32_tape_options delete mode 100644 regress/win32/tests/2drive-incremental-2disk.1.bscr delete mode 100644 regress/win32/tests/2drive-incremental-2disk.2.bscr delete mode 100644 regress/win32/tests/2drive-incremental-2disk.cmd delete mode 100644 regress/win32/tests/2drive-incremental-2tape delete mode 100644 regress/win32/tests/auto-label-test.bscr delete mode 100644 regress/win32/tests/auto-label-test.cmd delete mode 100644 regress/win32/tests/backup-bacula-tape delete mode 100644 regress/win32/tests/backup-bacula-test.bscr delete mode 100644 regress/win32/tests/backup-bacula-test.cmd delete mode 100644 regress/win32/tests/backup-win32-tape delete mode 100644 regress/win32/tests/bextract-test.bscr delete mode 100644 regress/win32/tests/bextract-test.cmd delete mode 100644 regress/win32/tests/bscan-fast-tape delete mode 100644 regress/win32/tests/bscan-tape delete mode 100644 regress/win32/tests/bscan-test.1.bscr delete mode 100644 regress/win32/tests/bscan-test.2.bscr delete mode 100644 regress/win32/tests/bscan-test.cmd delete mode 100644 regress/win32/tests/bsr-opt-test.bscr delete mode 100644 regress/win32/tests/bsr-opt-test.cmd delete mode 100644 regress/win32/tests/btape-fill-full-tape delete mode 100644 regress/win32/tests/btape-fill-tape delete mode 100644 regress/win32/tests/compressed-test.bscr delete mode 100644 regress/win32/tests/compressed-test.cmd delete mode 100644 regress/win32/tests/concurrent-jobs-test.bscr delete mode 100644 regress/win32/tests/concurrent-jobs-test.cmd delete mode 100644 regress/win32/tests/dev-test-root delete mode 100644 regress/win32/tests/differential-test.1.bscr delete mode 100644 regress/win32/tests/differential-test.2.bscr delete mode 100644 regress/win32/tests/differential-test.3.bscr delete mode 100644 regress/win32/tests/differential-test.cmd delete mode 100644 regress/win32/tests/eot-fail-tape delete mode 100644 regress/win32/tests/etc-test-root delete mode 100644 regress/win32/tests/fixed-block-size-tape delete mode 100644 regress/win32/tests/four-concurrent-jobs-tape delete mode 100644 regress/win32/tests/four-concurrent-jobs-test.bscr delete mode 100644 regress/win32/tests/four-concurrent-jobs-test.cmd delete mode 100644 regress/win32/tests/four-jobs-tape delete mode 100644 regress/win32/tests/four-jobs-test.1.bscr delete mode 100644 regress/win32/tests/four-jobs-test.2.bscr delete mode 100644 regress/win32/tests/four-jobs-test.3.bscr delete mode 100644 regress/win32/tests/four-jobs-test.4.bscr delete mode 100644 regress/win32/tests/four-jobs-test.5.bscr delete mode 100644 regress/win32/tests/four-jobs-test.cmd delete mode 100644 regress/win32/tests/hardlink-test delete mode 100644 regress/win32/tests/incremental-2disk.1.bscr delete mode 100644 regress/win32/tests/incremental-2disk.2.bscr delete mode 100644 regress/win32/tests/incremental-2disk.cmd delete mode 100644 regress/win32/tests/incremental-2tape.1.bscr delete mode 100644 regress/win32/tests/incremental-2tape.2.bscr delete mode 100644 regress/win32/tests/incremental-2tape.cmd delete mode 100644 regress/win32/tests/incremental-tape delete mode 100644 regress/win32/tests/incremental-test.1.bscr delete mode 100644 regress/win32/tests/incremental-test.2.bscr delete mode 100644 regress/win32/tests/incremental-test.3.bscr delete mode 100644 regress/win32/tests/incremental-test.4.bscr delete mode 100644 regress/win32/tests/incremental-test.5.bscr delete mode 100644 regress/win32/tests/incremental-test.cmd delete mode 100644 regress/win32/tests/lib-tape-root delete mode 100644 regress/win32/tests/lib-test-root delete mode 100644 regress/win32/tests/migration-job-test.cmd delete mode 100644 regress/win32/tests/migration-jobspan-test.cmd delete mode 100644 regress/win32/tests/migration-occupancy-test.cmd delete mode 100644 regress/win32/tests/migration-time-test.cmd delete mode 100644 regress/win32/tests/migration-volume-test.cmd delete mode 100644 regress/win32/tests/query-test.1.bscr delete mode 100644 regress/win32/tests/query-test.2.bscr delete mode 100644 regress/win32/tests/query-test.3.bscr delete mode 100644 regress/win32/tests/query-test.cmd delete mode 100644 regress/win32/tests/recycle-test.bscr delete mode 100644 regress/win32/tests/recycle-test.cmd delete mode 100644 regress/win32/tests/relabel-tape delete mode 100644 regress/win32/tests/restore-by-file-tape delete mode 100644 regress/win32/tests/restore-by-file-test.bscr delete mode 100644 regress/win32/tests/restore-by-file-test.cmd delete mode 100644 regress/win32/tests/restore-disk-seek-test.bscr delete mode 100644 regress/win32/tests/restore-disk-seek-test.cmd delete mode 100644 regress/win32/tests/restore2-by-file-test.bscr delete mode 100644 regress/win32/tests/restore2-by-file-test.cmd delete mode 100644 regress/win32/tests/runscript-test delete mode 100644 regress/win32/tests/scratch-pool-test.bscr delete mode 100644 regress/win32/tests/scratch-pool-test.cmd delete mode 100644 regress/win32/tests/six-vol-test.bscr delete mode 100644 regress/win32/tests/six-vol-test.cmd delete mode 100644 regress/win32/tests/small-file-size-tape delete mode 100644 regress/win32/tests/span-vol-test.bscr delete mode 100644 regress/win32/tests/span-vol-test.cmd delete mode 100644 regress/win32/tests/sparse-compressed-test.bscr delete mode 100644 regress/win32/tests/sparse-compressed-test.cmd delete mode 100644 regress/win32/tests/sparse-test.bscr delete mode 100644 regress/win32/tests/sparse-test.cmd delete mode 100644 regress/win32/tests/test0.cmd delete mode 100644 regress/win32/tests/truncate-bug-tape delete mode 100644 regress/win32/tests/two-jobs-test.1.bscr delete mode 100644 regress/win32/tests/two-jobs-test.2.bscr delete mode 100644 regress/win32/tests/two-jobs-test.cmd delete mode 100644 regress/win32/tests/two-pool-tape delete mode 100644 regress/win32/tests/two-pool-test.bscr delete mode 100644 regress/win32/tests/two-pool-test.cmd delete mode 100644 regress/win32/tests/two-vol-test.bscr delete mode 100644 regress/win32/tests/two-vol-test.cmd delete mode 100644 regress/win32/tests/two-volume-tape.1.bscr delete mode 100644 regress/win32/tests/two-volume-tape.2.bscr delete mode 100644 regress/win32/tests/two-volume-tape.cmd delete mode 100644 regress/win32/tests/two-volume-test.bscr delete mode 100644 regress/win32/tests/two-volume-test.cmd delete mode 100644 regress/win32/tests/usr-tape-root delete mode 100644 regress/win32/tests/verify-vol-tape delete mode 100644 regress/win32/tests/verify-vol-test.bscr delete mode 100644 regress/win32/tests/verify-vol-test.cmd delete mode 100644 regress/win32/tests/weird-files-test delete mode 100644 regress/win32/tests/weird-files2-test delete mode 100644 regress/win32/tests/win32-backup-tape delete mode 100644 regress/win32/tests/win32-to-linux-tape diff --git a/bacula/po/de.gmo b/bacula/po/de.gmo new file mode 100644 index 0000000000000000000000000000000000000000..caaf3151f8ac41dc2f23bdf134c30dbed420fa1e GIT binary patch literal 479 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 literal 0 HcmV?d00001 diff --git a/bacula/po/it.gmo b/bacula/po/it.gmo new file mode 100644 index 0000000000000000000000000000000000000000..c7dc0b7163dd42b856943564e4418d2f1ceea9c9 GIT binary patch literal 470 zcmaiw&q@O^5XKcf?a{M`2p$xjHK|s&X)EGCC|Fvwc%N>k+en%$Nmlehy!mWCi&F)A z^dmo#kT3Zr^R=`6vBBD8cA0%b+Vv2e6O(<#ZLq)lxl#NFdxCw-bpM+aX zq(w{0b5Jd46+(5iIy;g|N;bkHy_!|@+SdkI@DS=kx8;%Ko7n@#1e1U+T1-A@A$s!~ z1D55&ICF(I5pr;D(j|Lc)nG+1AzW%PNN5c@(fhyd%WOCp-mQC~a+%$Dm&kGWd(FQ{ z^p;L)i^g?Dxxf%9^#@NQD2jFm)Y`nNbWQ>8T $Bweb::config_file); $conf->load(); @@ -58,7 +57,7 @@ my $graph = CGI::param('graph') || 'job_size'; my $legend = CGI::param('legend') || 'on' ; $legend = ($legend eq 'on')?1:0; -my $arg = $bweb->get_form(qw/width height limit offset age where jobid +my $arg = $bweb->get_form(qw/width height limit offset age jfilesets level status jjobnames jclients/); my ($limitq, $label) = $bweb->get_limit(age => $arg->{age}, @@ -256,102 +255,6 @@ $limitq print $obj->plot([$d, values %$ret])->png; } -# it works only with postgresql at this time -elsif ($graph eq 'file_histo' and $arg->{where}) { - - my $dir = $dbh->quote(dirname($arg->{where}) . '/'); - my $file = $dbh->quote(basename($arg->{where})); - - my $query = " -SELECT UNIX_TIMESTAMP(Job.StartTime) AS starttime, - Client.Name AS client, - Job.Name AS jobname, - base64_decode_lstat(8,LStat) AS lstat - -FROM Job, Client, FileSet, Filename, Path, File -WHERE Job.ClientId = Client.ClientId - AND Job.FileSetId = FileSet.FileSetId - AND Job.Type = 'B' - AND File.JobId = Job.JobId - AND File.FilenameId = Filename.FilenameId - AND File.PathId = Path.PathId - AND Path.Path = $dir - AND Filename.Name = $file - $clientq - $statusq - $filesetq - $levelq - $jobnameq -$limitq -"; - - print STDERR $query if ($debug); - - my $all = $dbh->selectall_arrayref($query) ; - - my $obj = get_graph('title' => "File size : $arg->{where}", - 'y_label' => 'File size', - 'y_min_value' => 0, - 'y_min_value' => 0, - 'y_number_format' => \&Bweb::human_size, - ); - - - my ($d, $ret) = make_tab($all); - if ($legend) { - $obj->set_legend(keys %$ret); - } - print $obj->plot([$d, values %$ret])->png; -} - -# it works only with postgresql at this time -# TODO: use brestore_missing_path -elsif ($graph eq 'rep_histo' and $arg->{where}) { - - my $dir = $arg->{where}; - $dir .= '/' if ($dir !~ m!/$!); - $dir = $dbh->quote($dir); - - my $query = " -SELECT UNIX_TIMESTAMP(Job.StartTime) AS starttime, - Client.Name AS client, - Job.Name AS jobname, - brestore_pathvisibility.size AS size - -FROM Job, Client, FileSet, Path, brestore_pathvisibility -WHERE Job.ClientId = Client.ClientId - AND Job.FileSetId = FileSet.FileSetId - AND Job.Type = 'B' - AND Job.JobId = brestore_pathvisibility.JobId - AND Path.PathId = brestore_pathvisibility.PathId - AND Path.Path = $dir - $clientq - $statusq - $filesetq - $levelq - $jobnameq -$limitq -"; - - print STDERR $query if ($debug); - - my $all = $dbh->selectall_arrayref($query) ; - - my $obj = get_graph('title' => "Directory size : $arg->{where}", - 'y_label' => 'Directory size', - 'y_min_value' => 0, - 'y_min_value' => 0, - 'y_number_format' => \&Bweb::human_size, - ); - - - my ($d, $ret) = make_tab($all); - if ($legend) { - $obj->set_legend(keys %$ret); - } - print $obj->plot([$d, values %$ret])->png; -} - elsif ($graph eq 'job_rate') { my $query = " diff --git a/regress/.cvsignore b/regress/.cvsignore deleted file mode 100644 index 90b65e5916..0000000000 --- a/regress/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -config.out -build -bin -test.out -weird-files -weird-files2 -diff -tmp -working -Makefile -test1.out -time.out diff --git a/regress/Makefile.in b/regress/Makefile.in deleted file mode 100644 index be5940ace0..0000000000 --- a/regress/Makefile.in +++ /dev/null @@ -1,72 +0,0 @@ -# -# Makefile for Bacula regression testing -# -# Note, Makefile is built from Makefile.in, which you should not really -# need to change, by envoking: -# -# ./config -# e.g. -# -# ./config kern.conf -# -# - -# suck in user's configuration -@CONFIG@ - -first_rule: all - -all: - -setup: bacula sed - -# -# Some machines cannot handle the sticky bit and other garbage that -# is in weird-files, so we load and run it only on Linux machines. -# -bacula: all - @rm -rf bin build weird-files tmp - (if test x`uname` = xLinux -o x`uname` = xFreeBSD ; then \ - tar xfz weird-files.tar.gz ;\ - fi) - rm -rf tmp working - mkdir tmp working - echo "Doing: scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${OPENSSL}" - scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${SMTP_HOST} ${OPENSSL} - -sed: - echo "Doing: scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH} ${TAPE_DRIVE1} ${SMTP_HOST}" - scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH} ${TAPE_DRIVE1} ${SMTP_HOST} - -# Run all non-root userid tests -test: - ./all-non-root-tests - -# run all file and tape tests -full_test: - ./all-tape-and-file-tests - -# These tests require you to run as root -root_test: - ./all-root-tests - -clean: - scripts/cleanup - rm -f /tmp/file-list - rm -fr tmp/* working/* - rm -f test.out - rm -f diff - rm -f 1 2 3 scripts/1 scripts/2 scripts/3 tests/1 tests/2 tests/3 - find . -name .#* -exec rm -rf {} \; - -# Reset our userid after running as root -reset: - chown -R ${USER}:${USER} . tmp working - scripts/cleanup - rm -f /tmp/file-list tmp/file-list - rm -f tmp/* working/* - -distclean: clean - rm -rf bin build weird-files weird-files weird-files2 tmp working - rm -f scripts/*.conf - diff --git a/regress/README b/regress/README deleted file mode 100644 index 040f87fc11..0000000000 --- a/regress/README +++ /dev/null @@ -1,126 +0,0 @@ - Bacula Regression - Kern Sibbald - -This is Bacula's regression script directory. - -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -Warning!!!! Make sure not to run it on the same system -with your production Catalog because the tables will all -be cleared. You can run it on the your production system -if you use a different database. E.g. if your production -system uses MySQL, you can use SQLite here. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - - -To set it up, create your personal configuration file, by -copying prototype.conf to xxx.conf or simply editing prototype.conf -directly. - -Then edit your conf file and define appropriate values -for the variables that are in that file. If you want to see -a real example, look at kern.conf, but please don't use my -email address! - -If you are using SQLite, make sure that depkgs is pre-built if it -isn't already: (cd your-depkgs; make sqlite). - -Note, if you use any database other than SQLite, be sure it is not -your production database because Bacula will delete all the tables -and recreate them. With SQLite, a new different database is created, -so it will not affect your production system. - -Using the .conf file, you can now select between any Catalog type: -SQLite, SQLite3, MySQL, or PostgreSQL. Be aware, however, if you -use an installed database on a production server, running these -tests will delete all the tables !!!!!!!!!!!!!!!!!! I run my -tests on a non-production machine, and in addition, I normally use -SQLite as the database, while my production uses MySQL. - -Then do: - - ./config xxx.conf - make setup - -You run the above one time. This will build a Makefile from -Makefile.in and your xxx.conf file, copy the Bacula source, -configure, build it, and configure all the Bacula scripts -and conf files. If you change your source, you will need to -redo this command. - -Then you can run any of the tests in the tests subdirectory. -Each test whose name ends in -root requires you to be root for -a resonable run. Each test is totally independent of any other -test. Aside from the required "make setup", each test is totally -self-initalizing and should clean up after itself. - -All the tests expect you to execute them from the main regress -directory! - -You can run all the disk based tests by doing: - - ./do_file - -The disk based tests are totally separate from any production -system, provided you have configured the database appropriately -as noted above. - -You can run all the disk and most of the tape tests by doing: - - ./do_all - -======== Important !!! ============ -When running the tape tests, Bacula will write on any tape that -is in the tape drive that you have configured. If it is a production -Bacula tape, it will be destroyed. If you have configured an Autochanger, -Bacula will write on the tapes in slots 1 and 2 thus destroying any -information on those tapes, even if they are Bacula production tapes. -=================================== - -Each of the above calls one or more scripts. By looking at the -scripts available in this directory, you can see that there are a number -of options for running tests. - -You can run them individually as: - - tests/two-jobs-test - -or all non-root tests (my normal testing under my account) - - ./all-non-root-tests - -or all tests (I only run these before a production release): - - su - ./all-tests - - -after running the root tests, while still root, it is a good idea -to do: - - make reset - -this cleans up any files that may be created with root permissions. - -If you want to add more tests, do so by putting the shell script -in the tests subdirectory. Be careful when adding (or better not) -new clients, pools, and such to the test-bacula-dir.conf.in file -as it may invalidate a good number of tests, which respond to -questions by answering with a number (i.e. the order of the selection -list is known). It might be better to add your own testb-bacula... -configuration file. - -To avoid re-doing a make setup if you have made a change to the -conf files, and you do not need a new copy of the source, you can simply do: - - make sed - -Debugging failed tests: -The simplest thing to do is to edit tests/xxxx where xxxx is the name of -the test, and change the line "set_debug 0" to "set_debug 1". If the test has -not been updated to have the debug variable, please notify Kern, and I -will be happy to fix it -- I am upgrading them one at a time. - -Also, if you run from time to time on a computer that is not connected -to the network, please be sure that "hostname" is set to "localhost", -otherwise, your tests may fail because the hostname used by Bacula's -./configure cannot be properly resolved. diff --git a/regress/all-non-root-2tape-tests b/regress/all-non-root-2tape-tests deleted file mode 100755 index 5201731263..0000000000 --- a/regress/all-non-root-2tape-tests +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# Run all tape tests -# -tests/test0 -tests/two-volume-tape -tests/incremental-2tape -echo " " -echo " " -echo "2 Tape Test results" -cat test.out -scripts/cleanup diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests deleted file mode 100755 index 5e57ebb2df..0000000000 --- a/regress/all-non-root-tape-tests +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Run all tape tests -# -. ./config.out -if test ! x$AUTOCHANGER = x/dev/null ; then - mtx -f $AUTOCHANGER load 1 >/dev/null &2>/dev/null -fi -cp test.out test1.out -tests/test0 -tests/backup-bacula-tape -tests/btape-fill-tape -tests/fixed-block-size-tape -tests/four-concurrent-jobs-tape -tests/four-jobs-tape -tests/incremental-tape -tests/relabel-tape -tests/restore-by-file-tape -tests/small-file-size-tape -tests/truncate-bug-tape -tests/two-pool-tape -tests/2drive-incremental-2tape -tests/bscan-tape -tests/verify-vol-tape -echo " " -echo " " -echo "Test results" -cat test.out -scripts/cleanup diff --git a/regress/all-non-root-tests b/regress/all-non-root-tests deleted file mode 100755 index 783c887981..0000000000 --- a/regress/all-non-root-tests +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# -# Run all tests -# -rm -f test1.out -tests/test0 -echo " " -tests/auto-label-test -tests/backup-bacula-test -tests/bextract-test -tests/bscan-test -tests/bsr-opt-test -tests/compressed-test -tests/compressed-encrypt-test -tests/concurrent-jobs-test -tests/data-encrypt-test -#tests/sparse-encrypt-test -#tests/gigaslam-sparse-test -tests/differential-test -tests/four-concurrent-jobs-test -tests/four-jobs-test -tests/incremental-test -tests/query-test -tests/recycle-test -tests/restore2-by-file-test -tests/restore-by-file-test -tests/restore-disk-seek-test -tests/six-vol-test -tests/span-vol-test -tests/sparse-compressed-test -tests/sparse-test -tests/two-jobs-test -tests/two-vol-test -tests/verify-vol-test -tests/weird-files2-test -tests/weird-files-test -tests/migration-job-test -tests/migration-jobspan-test -tests/migration-volume-test -tests/migration-time-test -tests/hardlink-test -# -# The following are Virtual Disk Autochanger tests -tests/two-pool-test -tests/two-volume-test -tests/incremental-2disk -tests/2drive-incremental-2disk -tests/scratch-pool-test -echo " " -echo "Test results" -cat test.out -scripts/cleanup diff --git a/regress/all-root-tests b/regress/all-root-tests deleted file mode 100755 index 3f077bba4c..0000000000 --- a/regress/all-root-tests +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# Run all root tests -# -rm -f test.out -tests/dev-test-root -tests/etc-test-root -tests/lib-test-root -tests/usr-tape-root -cat test.out -scripts/cleanup diff --git a/regress/all-tape-and-file-tests b/regress/all-tape-and-file-tests deleted file mode 100755 index f3e726914a..0000000000 --- a/regress/all-tape-and-file-tests +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# Run all tests -# -./all-non-root-tests -./endtime -./all-non-root-tape-tests diff --git a/regress/all-tests b/regress/all-tests deleted file mode 100755 index b1b2b35e86..0000000000 --- a/regress/all-tests +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# Run all tests -# -./all-non-root-tests -./all-root-tests -cat test.out -scripts/cleanup diff --git a/regress/config b/regress/config deleted file mode 100755 index 4bc4f52703..0000000000 --- a/regress/config +++ /dev/null @@ -1,9 +0,0 @@ -#/bin/sh -# -# First argument is expected to be a user's configuration file -# -if ! test -e $1 ; then - echo "Arg1 must specify a config file (e.g. prototype.conf)" - exit 1 -fi -sed -e "/@CONFIG@/r $1" -e "s/@CONFIG@//" Makefile.in >Makefile diff --git a/regress/do_all b/regress/do_all deleted file mode 100755 index cc89df2178..0000000000 --- a/regress/do_all +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -/home/kern/bacula/bin/startmysql -make setup -./starttime -if [ ! -e bin/tape_options ] ; then - touch bin/tape_options -fi -./all-tape-and-file-tests -./endtime -./all-non-root-2tape-tests -./endtime diff --git a/regress/do_all_tapes b/regress/do_all_tapes deleted file mode 100755 index dd07d2ec99..0000000000 --- a/regress/do_all_tapes +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -make setup -./all-non-root-tape-tests diff --git a/regress/do_file b/regress/do_file deleted file mode 100755 index 5fe0a82ecb..0000000000 --- a/regress/do_file +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# /home/kern/bacula/bin/startmysql -make setup -./starttime -./all-non-root-tests -./endtime diff --git a/regress/endtime b/regress/endtime deleted file mode 100755 index faf419f70d..0000000000 --- a/regress/endtime +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/python -from time import time as now - -t = now() -fn = open('time.out', 'r') -s = fn.readline() -fn.close() -diff = t - float(s) -h = int(diff / 3600) -m = int((diff - h * 3600) / 60) -sec = diff - h * 3600 - m * 60 -print 'Total time = %d:%02d:%02d or %d secs' % (h, m, sec, t - float(s)) diff --git a/regress/file b/regress/file deleted file mode 100755 index 8f2089051b..0000000000 --- a/regress/file +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./all-non-root-tests diff --git a/regress/freebsd.conf b/regress/freebsd.conf deleted file mode 100644 index 823eb9cbbf..0000000000 --- a/regress/freebsd.conf +++ /dev/null @@ -1,31 +0,0 @@ -# Where to get the source to be tested -# BACULA_SOURCE="${HOME}/bacula/branch-1.36.2" -BACULA_SOURCE="${HOME}/bacula/k" - -# Where to send email !!!!! Change me !!!!!!! -EMAIL=kern@sibbald.com -SMTP_HOST="matou.sibbald.com" - -# Full "default" path where to find sqlite (no quotes!) -SQLITE_DIR=${HOME}/bacula/depkgs/sqlite - -TAPE_DRIVE="/dev/nsa0" -# if you don't have an autochanger set AUTOCHANGER to /dev/null -AUTOCHANGER="/dev/sg0" -# For two drive tests -- set to /dev/null if you do not have it -TAPE_DRIVE1="/dev/null" - -# This must be the path to the autochanger including its name -AUTOCHANGER_PATH="/usr/local/sbin/mtx" - -# Set your database here -WHICHDB?="--with-sqlite=${SQLITE_DIR}" -#WHICHDB="--with-mysql=${HOME}/mysql" - -# Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers" -TCPWRAPPERS="--with-tcp-wrappers" - -# Set this to "" to disable OpenSSL support, "--with-openssl=yes" -# to enable it, or provide the path to the OpenSSL installation, -# eg "--with-openssl=/usr/local" -OPENSSL="" diff --git a/regress/kern.conf b/regress/kern.conf deleted file mode 100644 index 11c2c5160b..0000000000 --- a/regress/kern.conf +++ /dev/null @@ -1,35 +0,0 @@ -# Where to get the source to be tested -# BACULA_SOURCE="${HOME}/bacula/branch-1.38" -#BACULA_SOURCE="${HOME}/bacula/bacula-1.39.22-20060908" -BACULA_SOURCE="${HOME}/bacula/k" - -# Where to send email !!!!! Change me !!!!!!! -EMAIL=kern@sibbald.com -SMTP_HOST="localhost" - -# Full "default" path where to find sqlite (no quotes!) -#SQLITE_DIR=${HOME}/bacula/depkgs/sqlite3 -SQLITE_DIR=${HOME}/bacula/depkgs/sqlite - -TAPE_DRIVE="/dev/nst0" -# if you don't have an autochanger set AUTOCHANGER to /dev/null -AUTOCHANGER="/dev/sg0" -# For two drive tests -- set to /dev/null if you do not have it -TAPE_DRIVE1="/dev/null" - -# This must be the path to the autochanger including its name -AUTOCHANGER_PATH="/usr/sbin/mtx" - -# Set your database here -#WHICHDB="--with-sqlite=${SQLITE_DIR}" -WHICHDB="--with-mysql" -#WHICHDB="--with-postgresql" -#WHICHDB="--with-sqlite3=${SQLITE_DIR}" - -# Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers" -TCPWRAPPERS="--with-tcp-wrappers" - -# Set this to "" to disable OpenSSL support, "--with-openssl=yes" -# to enable it, or provide the path to the OpenSSL installation, -# eg "--with-openssl=/usr/local" -OPENSSL="--with-openssl" diff --git a/regress/misc-tests b/regress/misc-tests deleted file mode 100644 index dd2734c56b..0000000000 --- a/regress/misc-tests +++ /dev/null @@ -1,2 +0,0 @@ -tests/btape-fill-full-tape -tests/eot-fail-tape diff --git a/regress/prototype.conf b/regress/prototype.conf deleted file mode 100644 index 2ea5a7079f..0000000000 --- a/regress/prototype.conf +++ /dev/null @@ -1,52 +0,0 @@ -# -# Prototype personal configuration file for the regression -# scripts. Either edit this file directly, or better copy -# it elsewhere so it won't get overwritten. -# - -# -# Put the full path to the Bacula source code to be tested -# -BACULA_SOURCE= - -# Where to send email messages -# -EMAIL= -SMTP_HOST=localhost - -# Full "default" path where to find sqlite. -# This is only used if you do not specify a database override on the -# make command. -# -# N.B. DON'T PUT QOUTES AROUND THE PATH. -# -SQLITE_DIR=${HOME}/bacula/depkgs/sqlite - -# -# The device name of your tape drive if you have one -# -TAPE_DRIVE=/dev/nst0 -TAPE_DRIVE1=/dev/null - -# -# if you don't have an autochanger set AUTOCHANGER to /dev/null -# -AUTOCHANGER=/dev/sg0 - -# -# This must be the path to the autochanger including its name -# -AUTOCHANGER_PATH=/bin/mtx - -# Set your database here -WHICHDB="--with-sqlite=${SQLITE_DIR}" -#WHICHDB="--with-mysql" -#WHICHDB="--with-postgresql" - -# Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers" -TCPWRAPPERS="--with-tcp-wrappers" - -# Set this to "" to disable OpenSSL support, "--with-openssl=yes" -# to enable it, or provide the path to the OpenSSL installation, -# eg "--with-openssl=/usr/local" -OPENSSL="" diff --git a/regress/run b/regress/run deleted file mode 100755 index d48e2623c6..0000000000 --- a/regress/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -bin/bacula start -bin/bconsole -c bin/bconsole.conf diff --git a/regress/scripts/.cvsignore b/regress/scripts/.cvsignore deleted file mode 100644 index 9b411b0739..0000000000 --- a/regress/scripts/.cvsignore +++ /dev/null @@ -1,26 +0,0 @@ -bacula-dir-migration.conf -bacula-sd-migration.conf -crypto-bacula-fd.conf -new-test-bacula-dir.conf -bacula-dir.conf -bacula-fd.conf -bacula-sd.conf -console.conf -bconsole.conf -test-bacula-dir.conf -test-bacula-fd.conf -test-bacula-sd.conf -test-console.conf -testa-bacula-dir.conf -bacula-dir-tape.conf -bacula-sd-tape.conf -bacula-sd-2tape.conf -cleanup-tape -cleanup-2tape -prepare-two-tapes -cleanup-2drive -bacula-sd-2drive.conf -bacula-sd-win32-tape.conf -bacula-sd-2drive.conf -bacula-dir-win32-tape.conf -win32-bacula-dir-tape.conf diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in deleted file mode 100644 index fb577c7666..0000000000 --- a/regress/scripts/bacula-dir-migration.conf.in +++ /dev/null @@ -1,229 +0,0 @@ -# -# Default Bacula Director Configuration file -# -# The only thing that MUST be changed is to add one or more -# file or directory names in the Include directive of the -# FileSet resource. -# -# For Bacula release 1.39 -# -# You might also want to change the default email address -# from root to your address. See the "mail" and "operator" -# directives in the Messages resource. -# - -Director { # define myself - Name = @hostname@-dir - DIRport = 8101 # where we listen for UA connections - QueryFile = "@scriptdir@/query.sql" - WorkingDirectory = "@working_dir@" - PidDirectory = "@piddir@" - Maximum Concurrent Jobs = 4 - Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" - Messages = Daemon -} - -# -# Define the main nightly save backup job -# By default, this job will back up to disk in /tmp -Job { - Name = "NightlySave" - Type = Backup - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" - Maximum Concurrent Jobs = 4 - SpoolData = yes -# Prefer Mounted Volumes = no -} - -Job { - Name = "migrate-job" - Type = Migrate - Level = Full - Client=@hostname@-fd - FileSet="Full Set" - Messages = Standard - Storage = DiskChanger - Write Bootstrap = "@working_dir@/migratejob.bsr" - Pool = Default - Maximum Concurrent Jobs = 4 - Selection Type = Job - Selection Pattern = ".*Save" -} - -Job { - Name = "migrate-volume" - Type = Migrate - Level = Full - Client=@hostname@-fd - FileSet="Full Set" - Messages = Standard - Storage = DiskChanger - Write Bootstrap = "@working_dir@/migratevol.bsr" - Pool = Default - Maximum Concurrent Jobs = 4 - Selection Type = Volume - Selection Pattern = "File*" -} - -Job { - Name = "migrate-occupancy" - Type = Migrate - Level = Full - Client=@hostname@-fd - FileSet="Full Set" - Messages = Standard - Storage = DiskChanger - Write Bootstrap = "@working_dir@/migratejob.bsr" - Pool = Default - Maximum Concurrent Jobs = 4 - Selection Type = PoolOccupancy -} - -Job { - Name = "migrate-time" - Type = Migrate - Level = Full - Client=@hostname@-fd - FileSet="Full Set" - Messages = Standard - Storage = DiskChanger - Write Bootstrap = "@working_dir@/migratejob.bsr" - Pool = Default - Maximum Concurrent Jobs = 4 - Selection Type = PoolTime -} - - - - -# Standard Restore template, to be changed by Console program -Job { - Name = "RestoreFiles" - Type = Restore - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Where = /tmp/bacula-restores -} - - -# List of files to be backed up -FileSet { - Name = "Full Set" - Include { Options { signature=MD5 } - File = &1 >/dev/null -@output tmp/dir.out -status dir -@output tmp/fd.out -status client -@output tmp/sd.out -status $1 -@output -quit -END_OF_DATA -grep "No Jobs running." tmp/dir.out 2>&1 >/dev/null -if [ $? != 0 ] ; then - echo " " - echo " !!!! Zombie Jobs in Director !!!!" - echo " !!!! Zombie Jobs in Director !!!!" >>test.out - echo " " -fi -grep "No Jobs running." tmp/fd.out 2>&1 >/dev/null -if [ $? != 0 ] ; then - echo " " - echo " !!!! Zombie Jobs in File daemon !!!!" - echo " !!!! Zombie Jobs in File daemon !!!!" >>test.out - echo " " -fi -grep "No Jobs running." tmp/sd.out 2>&1 >/dev/null -if [ $? != 0 ] ; then - echo " " - echo " !!!! Zombie Jobs in Storage daemon !!!!" - echo " !!!! Zombie Jobs in Storage daemon !!!!" >>test.out - echo " " -fi -grep "ERROR" tmp/log*.out 2>&1 >/dev/null -if [ $? = 0 ] ; then - echo " " - echo " !!!! ERROR in log output !!!!" - echo " !!!! ERROR in log output !!!!" >>test.out - echo " " -fi -grep "Fatal Error" tmp/log*.out 2>&1 >/dev/null -if [ $? = 0 ] ; then - echo " " - echo " !!!! Fatal Error in log output !!!!" - echo " !!!! Fatal Error in log output !!!!" >>test.out - echo " " -fi - diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup deleted file mode 100755 index 46079e4f1f..0000000000 --- a/regress/scripts/cleanup +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# Cleanup left over files -- both before and after test run -# -rm -rf /tmp/FileVolume* tmp/FileVolume* -rm -rf /tmp/TestVolume001 /tmp/bacula-restores /tmp/Small* -rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume* -rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out -rm -rf /tmp/sed_tmp /tmp/file-list -rm -rf tmp/build tmp/restore-list tmp/restore2-list -rm -rf tmp/fd.out tmp/dir.out tmp/sd.out -rm -rf working/log tmp/TEST-* -rm -rf working/*.bsr -rm -rf tmp/disk-changer /tmp/disk-changer -find . -name "gigaslam.gif" -exec rm -f {} \; - -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges >/dev/null 2>&1 -cd .. diff --git a/regress/scripts/cleanup-2drive.in b/regress/scripts/cleanup-2drive.in deleted file mode 100755 index 32b27c019e..0000000000 --- a/regress/scripts/cleanup-2drive.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Cleanup left over files -- both before and after test run -# -scripts/cleanup - -if test x@autochanger@ != x/dev/null; then - slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1` - echo "Slot $slot in drive 1" - if test x$slot != x0 ; then - echo "unload slot $slot in drive 1" - bin/mtx-changer @autochanger@ unload $slot @tape_drive1@ 1 - fi - slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive@ 0` - echo "Slot $slot in drive 0" - if test x$slot != x0 ; then - echo "unload slot $slot in drive 0" - bin/mtx-changer @autochanger@ unload $slot @tape_drive@ 0 - fi - - - slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1` - if test x$slot != x2; then - echo "load slot 2 in drive 1" - bin/mtx-changer @autochanger@ load 2 @tape_drive1@ 1 - fi - echo "WEOF drive 1" - mt -f @tape_drive1@ rewind - mt -f @tape_drive1@ weof - echo "unload slot 2 in drive 1" - bin/mtx-changer @autochanger@ unload 2 @tape_drive1@ 1 - - slot=`bin/mtx-changer @autochanger@ loaded 0 @tape_drive@ 0` - echo "Slot $slot in drive 0" - if test x$slot != x1; then - echo "load slot 1 in drive 0" - bin/mtx-changer @autochanger@ load 1 @tape_drive@ 0 - fi - echo "WEOF drive 0" - mt -f @tape_drive@ rewind - mt -f @tape_drive@ weof - echo "unload slot 1 from drive 0" - bin/mtx-changer @autochanger@ unload 1 @tape_drive@ 0 -fi diff --git a/regress/scripts/cleanup-2tape.in b/regress/scripts/cleanup-2tape.in deleted file mode 100755 index 0f33ec95c7..0000000000 --- a/regress/scripts/cleanup-2tape.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Cleanup left over files -- both before and after test run -# -scripts/cleanup - -if test x@autochanger@ != x/dev/null; then - drive=`bin/mtx-changer @autochanger@ loaded 0 dummy 0` - if test x${drive} != x2; then - bin/mtx-changer @autochanger@ unload 0 @tape_drive@ 0 - bin/mtx-changer @autochanger@ load 2 @tape_drive@ 0 - fi - mt -f @tape_drive@ rewind - mt -f @tape_drive@ weof -fi - - -# -# If we have an autochanger always load tape in slot 1 -# -if test x@autochanger@ != x/dev/null; then - drive=`bin/mtx-changer @autochanger@ loaded 0 dummy 0` - if test x${drive} != x1; then - bin/mtx-changer @autochanger@ unload 0 @tape_drive@ 0 - bin/mtx-changer @autochanger@ load 1 @tape_drive@ 0 - fi -fi - -mt -f @tape_drive@ rewind -mt -f @tape_drive@ weof diff --git a/regress/scripts/cleanup-tape.in b/regress/scripts/cleanup-tape.in deleted file mode 100755 index 98ed537766..0000000000 --- a/regress/scripts/cleanup-tape.in +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# Cleanup left over files -- both before and after test run -# -scripts/cleanup - -mt -f @tape_drive@ rewind -mt -f @tape_drive@ weof diff --git a/regress/scripts/copy-2disk-confs b/regress/scripts/copy-2disk-confs deleted file mode 100755 index 87790955f0..0000000000 --- a/regress/scripts/copy-2disk-confs +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# Setup for using the Virtual Disk Changer (simulates tape changer) -# -/bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf -/bin/cp -f scripts/bacula-sd-2disk.conf bin/bacula-sd.conf -/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf -outf="tmp/sed_tmp" -echo "s%# Autochanger = yes% Autochanger = yes%g" >${outf} -cp bin/bacula-dir.conf tmp/1 -sed -f ${outf} tmp/1 >bin/bacula-dir.conf diff --git a/regress/scripts/copy-2disk-drive-confs b/regress/scripts/copy-2disk-drive-confs deleted file mode 100755 index 7a5dcd30ea..0000000000 --- a/regress/scripts/copy-2disk-drive-confs +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf -/bin/cp -f scripts/bacula-sd-2disk-drive.conf bin/bacula-sd.conf -/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf -outf="tmp/sed_tmp" -echo "s%# Autochanger = yes% Autochanger = yes%g" >${outf} -cp bin/bacula-dir.conf tmp/1 -sed -f ${outf} tmp/1 >bin/bacula-dir.conf - diff --git a/regress/scripts/copy-2drive-confs b/regress/scripts/copy-2drive-confs deleted file mode 100755 index 0388c4c175..0000000000 --- a/regress/scripts/copy-2drive-confs +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf -/bin/cp -f scripts/bacula-sd-2drive.conf bin/bacula-sd.conf -/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf -outf="tmp/sed_tmp" -echo "s%# Autochanger = yes% Autochanger = yes%g" >${outf} -cp bin/bacula-dir.conf tmp/1 -sed -f ${outf} tmp/1 >bin/bacula-dir.conf - -# get proper SD tape definitions -cp -f scripts/linux_tape_options bin/tape_options -if test x`uname` = xFreeBSD ; then - cp -f scripts/freebsd_tape_options bin/tape_options -fi diff --git a/regress/scripts/copy-2tape-confs b/regress/scripts/copy-2tape-confs deleted file mode 100755 index e23adc5c82..0000000000 --- a/regress/scripts/copy-2tape-confs +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf -/bin/cp -f scripts/bacula-sd-2tape.conf bin/bacula-sd.conf -/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf -outf="tmp/sed_tmp" -echo "s%# Autochanger = yes% Autochanger = yes%g" >${outf} -cp bin/bacula-dir.conf tmp/1 -sed -f ${outf} tmp/1 >bin/bacula-dir.conf - -# get proper SD tape definitions -cp -f scripts/linux_tape_options bin/tape_options -if test x`uname` = xFreeBSD ; then - cp -f scripts/freebsd_tape_options bin/tape_options -fi diff --git a/regress/scripts/copy-confs b/regress/scripts/copy-confs deleted file mode 100755 index c12a20a359..0000000000 --- a/regress/scripts/copy-confs +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/bacula-dir.conf bin/bacula-dir.conf -/bin/cp -f scripts/bacula-sd.conf bin/bacula-sd.conf -/bin/cp -f scripts/bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/bconsole.conf bin/bconsole.conf - -# get proper SD tape definitions -cp -f scripts/linux_tape_options bin/tape_options -if test x`uname` = xFreeBSD ; then - cp -f scripts/freebsd_tape_options bin/tape_options -fi diff --git a/regress/scripts/copy-crypto-confs b/regress/scripts/copy-crypto-confs deleted file mode 100755 index 28df20cb21..0000000000 --- a/regress/scripts/copy-crypto-confs +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/new-test-bacula-dir.conf bin/bacula-dir.conf -/bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf -/bin/cp -f scripts/crypto-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf -/bin/cp -f scripts/cryptokeypair.pem bin/cryptokeypair.pem diff --git a/regress/scripts/copy-migration-confs b/regress/scripts/copy-migration-confs deleted file mode 100755 index c7680bc40e..0000000000 --- a/regress/scripts/copy-migration-confs +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# Setup for using the Virtual Disk Changer (simulates tape changer) -# -/bin/cp -f scripts/bacula-dir-migration.conf bin/bacula-dir.conf -/bin/cp -f scripts/bacula-sd-migration.conf bin/bacula-sd.conf -/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf diff --git a/regress/scripts/copy-tape-confs b/regress/scripts/copy-tape-confs deleted file mode 100755 index c8dae32c4a..0000000000 --- a/regress/scripts/copy-tape-confs +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/bacula-dir-tape.conf bin/bacula-dir.conf -/bin/cp -f scripts/bacula-sd-tape.conf bin/bacula-sd.conf -/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf - -# get proper SD tape definitions -cp -f scripts/linux_tape_options bin/tape_options -if test x`uname` = xFreeBSD ; then - cp -f scripts/freebsd_tape_options bin/tape_options -fi diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs deleted file mode 100755 index 5552c77116..0000000000 --- a/regress/scripts/copy-test-confs +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/new-test-bacula-dir.conf bin/bacula-dir.conf -/bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf -/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf - -# get proper SD tape definitions -cp -f scripts/linux_tape_options bin/tape_options -if test x`uname` = xFreeBSD ; then - cp -f scripts/freebsd_tape_options bin/tape_options -fi diff --git a/regress/scripts/copy-testa-confs b/regress/scripts/copy-testa-confs deleted file mode 100755 index 46116b9f90..0000000000 --- a/regress/scripts/copy-testa-confs +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/testa-bacula-dir.conf bin/bacula-dir.conf -/bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf -/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf - -# get proper SD tape definitions -cp -f scripts/linux_tape_options bin/tape_options -if test x`uname` = xFreeBSD ; then - cp -f scripts/freebsd_tape_options bin/tape_options -fi diff --git a/regress/scripts/copy-win32-confs b/regress/scripts/copy-win32-confs deleted file mode 100755 index 7cda59aabc..0000000000 --- a/regress/scripts/copy-win32-confs +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -/bin/cp -f scripts/win32-bacula-dir-tape.conf bin/bacula-dir.conf -/bin/cp -f scripts/win32-bacula-sd-tape.conf bin/bacula-sd.conf -/bin/cp -f scripts/win32-bacula-fd.conf bin/bacula-fd.conf -/bin/cp -f scripts/test-console.conf bin/bconsole.conf - -# get proper SD tape definitions -cp -f scripts/linux_tape_options bin/tape_options -if test x`uname` = xFreeBSD ; then - cp -f scripts/freebsd_tape_options bin/tape_options -fi diff --git a/regress/scripts/crypto-bacula-fd.conf.in b/regress/scripts/crypto-bacula-fd.conf.in deleted file mode 100644 index ec4152d2b8..0000000000 --- a/regress/scripts/crypto-bacula-fd.conf.in +++ /dev/null @@ -1,36 +0,0 @@ -# -# Default Bacula File Daemon Configuration file -# -# For Bacula release 1.33 -# -# There is not much to change here except perhaps the -# File daemon Name to -# - -# -# List Directors who are permitted to contact this File daemon -# -Director { - Name = @hostname@-dir - Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc" -} - -# -# "Global" File daemon configuration specifications -# -FileDaemon { # this is me - Name = @hostname@-fd - FDport = 8102 # where we listen for the director - WorkingDirectory = "@working_dir@" - Pid Directory = "@piddir@" - SubSys Directory = "@subsysdir@" - PKI Signatures = Yes - PKI Encryption = Yes - PKI Keypair = "@scriptdir@/cryptokeypair.pem" -} - -# Send all messages except skipped files back to Director -Messages { - Name = Standard - director = @hostname@-dir = all, !terminate -} diff --git a/regress/scripts/cryptokeypair.pem b/regress/scripts/cryptokeypair.pem deleted file mode 100644 index 440dcce4f0..0000000000 --- a/regress/scripts/cryptokeypair.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIBOgIBAAJBAKIc649Amif6weq+c8rVtS7jyn7E9oZ9Irrl9WviQZi0+J2OLgCi -PNaj/FzPhTIgBBRFEP0ZU5DfVv6CoXKbpr8CAwEAAQJAQbvUUFvzpi5pnxPmw+Jv -+zlmjIy1Icdv47UHFN3Dl3V0+X05g12xUlnyNKzo2jlSwkBi1w8AJCMV6/TnnLiI -AQIhAM4SH9cb01DUH+1O5gk90GgNYW1Aq2vL1vygm02kppi/AiEAyWQ9eAILPXhX -H3a7mEj8z1bCTBiVrhe73NUjim4QcgECIEC3hHRj8ruBwv0eODRSy27CNQTAuJVE -ESKJtfxuZzu1AiEAotXYFbahW/x3hUs9d25ca1EdHOYr8G3kSjRT3lQMHAECIHBl -uX+Ywc1jjWhc+vN2ZrLWkKMVbrd+SWOPUQGroM0j ------END RSA PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIICKzCCAdWgAwIBAgIJAO4x/m+tHX8HMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQwHhcNMDYxMjA0MDMxMzUwWhcNMDcwMTAzMDMxMzUwWjBF -MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 -ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKIc -649Amif6weq+c8rVtS7jyn7E9oZ9Irrl9WviQZi0+J2OLgCiPNaj/FzPhTIgBBRF -EP0ZU5DfVv6CoXKbpr8CAwEAAaOBpzCBpDAdBgNVHQ4EFgQUiGz2I+bks0nCHyCI -IwuV3DpDPMwwdQYDVR0jBG4wbIAUiGz2I+bks0nCHyCIIwuV3DpDPMyhSaRHMEUx -CzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRl -cm5ldCBXaWRnaXRzIFB0eSBMdGSCCQDuMf5vrR1/BzAMBgNVHRMEBTADAQH/MA0G -CSqGSIb3DQEBBQUAA0EAkjFYcs9rrpdURlBaNlbud68VlA5rU+Bv4keYx41DUmqo -sXtkQZENR9iYYYhOUso1/1dwQgrt3egjTZTtq7o5zw== ------END CERTIFICATE----- diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed deleted file mode 100755 index c471970e0e..0000000000 --- a/regress/scripts/do_sed +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# -if test $# != 6 ; then - echo "First arg must be email name" - echo " and the second must be a tape drive" - echo " and the third must be a tape control name or /dev/null" - echo " and the fourth must be the full path to the mtx program" - echo " and the fifth must be tape drive 1 or /dev/null" - echo " and the sixth must be the smtp or email host" - exit 1 -fi -cwd=`pwd` -mkdir -p ${cwd}/bin -out="/tmp/sed_tmp" -HOST="localhost" -# Create sed command script -echo "s%@sbindir@%${cwd}/bin%g" >${out} -echo "s%@scriptdir@%${cwd}/bin%g" >>${out} -echo "s%@working_dir@%${cwd}/working%g" >>${out} -echo "s%@piddir@%${cwd}/working%g" >>${out} -echo "s%@subsysdir@%${cwd}/working%g" >>${out} -echo "s%@job_email@%${1}%g" >>${out} -echo "s%@tape_drive@%${2}%g" >>${out} -echo "s%@autochanger@%${3}%g" >>${out} -echo "s%@tmpdir@%${cwd}/tmp%g" >>${out} -echo "s%@hostname@%${HOST}%g" >>${out} -echo "s%@changer_path@%${4}%g" >>${out} -echo "s%@tape_drive1@%${5}%g" >>${out} -echo "s%@smtp_host@%${6}%g" >>${out} -echo "s%@disk_drive@%${cwd}/tmp/disk-changer%g" >>${out} - -echo "AUTOCHANGER=\"${3}\"" >config.out -echo "TAPE_DRIVE1=\"${5}\"" >>config.out - - -# process .in files with sed script -sed -f ${out} ${cwd}/scripts/test-bacula-dir.conf.in >${cwd}/scripts/test-bacula-dir.conf -sed -f ${out} ${cwd}/scripts/new-test-bacula-dir.conf.in >${cwd}/scripts/new-test-bacula-dir.conf -sed -f ${out} ${cwd}/scripts/testa-bacula-dir.conf.in >${cwd}/scripts/testa-bacula-dir.conf -sed -f ${out} ${cwd}/scripts/test-bacula-fd.conf.in >${cwd}/scripts/test-bacula-fd.conf -sed -f ${out} ${cwd}/scripts/test-bacula-sd.conf.in >${cwd}/scripts/test-bacula-sd.conf -sed -f ${out} ${cwd}/scripts/test-console.conf.in >${cwd}/scripts/test-console.conf -sed -f ${out} ${cwd}/scripts/crypto-bacula-fd.conf.in >${cwd}/scripts/crypto-bacula-fd.conf -sed -f ${out} ${cwd}/scripts/bacula-dir-tape.conf.in >${cwd}/scripts/bacula-dir-tape.conf -sed -f ${out} ${cwd}/scripts/bacula-dir-migration.conf.in >${cwd}/scripts/bacula-dir-migration.conf -sed -f ${out} ${cwd}/scripts/win32-bacula-dir-tape.conf.in >${cwd}/scripts/win32-bacula-dir-tape.conf -sed -f ${out} ${cwd}/scripts/bacula-sd-tape.conf.in >${cwd}/scripts/bacula-sd-tape.conf -sed -f ${out} ${cwd}/scripts/bacula-sd-2tape.conf.in >${cwd}/scripts/bacula-sd-2tape.conf -sed -f ${out} ${cwd}/scripts/bacula-sd-migration.conf.in >${cwd}/scripts/bacula-sd-migration.conf -sed -f ${out} ${cwd}/scripts/bacula-sd-2disk.conf.in >${cwd}/scripts/bacula-sd-2disk.conf -sed -f ${out} ${cwd}/scripts/bacula-sd-2drive.conf.in >${cwd}/scripts/bacula-sd-2drive.conf -sed -f ${out} ${cwd}/scripts/bacula-sd-2disk-drive.conf.in >${cwd}/scripts/bacula-sd-2disk-drive.conf -sed -f ${out} ${cwd}/scripts/cleanup-tape.in >${cwd}/scripts/cleanup-tape -sed -f ${out} ${cwd}/scripts/cleanup-2tape.in >${cwd}/scripts/cleanup-2tape -sed -f ${out} ${cwd}/scripts/cleanup-2drive.in >${cwd}/scripts/cleanup-2drive -sed -f ${out} ${cwd}/scripts/prepare-two-tapes.in >${cwd}/scripts/prepare-two-tapes -sed -f ${out} ${cwd}/scripts/bacula-dir.conf.testrunscript.in >${cwd}/scripts/bacula-dir.conf.testrunscript - -cp ${cwd}/bin/bacula-sd.conf /tmp/bac$$ -sed s%/tmp%${cwd}/tmp%g /tmp/bac$$ >${cwd}/bin/bacula-sd.conf -chmod 777 ${cwd}/scripts/cleanup-*tape ${cwd}/scripts/cleanup-*drive ${cwd}/scripts/prepare-two-tapes -rm -f /tmp/bac$$ -cp ${cwd}/bin/mtx-changer /tmp/bac$$ -sed "s%^MTX.*$%MTX=${4}%g" /tmp/bac$$ >${cwd}/bin/mtx-changer -chmod 777 ${cwd}/bin/mtx-changer - -# get proper SD tape definitions -cp -f ${cwd}/scripts/linux_tape_options ${cwd}/bin/tape_options -if test x`uname` = xFreeBSD ; then - cp -f ${cwd}/scripts/freebsd_tape_options ${cwd}/bin/tape_options -fi - -rm -f ${out} -rm -f /tmp/bac$$ diff --git a/regress/scripts/exclude-dev-test b/regress/scripts/exclude-dev-test deleted file mode 100644 index 4165ea1ae7..0000000000 --- a/regress/scripts/exclude-dev-test +++ /dev/null @@ -1,5 +0,0 @@ -dev/ptmx -dev/pts -dev/rd/c5d2 -dev/rd -dev/shm diff --git a/regress/scripts/exclude-etc-test b/regress/scripts/exclude-etc-test deleted file mode 100644 index f59ca8df2a..0000000000 --- a/regress/scripts/exclude-etc-test +++ /dev/null @@ -1 +0,0 @@ -etc/mail/statistics diff --git a/regress/scripts/exclude-lib-test b/regress/scripts/exclude-lib-test deleted file mode 100644 index 5be32f443b..0000000000 --- a/regress/scripts/exclude-lib-test +++ /dev/null @@ -1,5 +0,0 @@ -lib/ld-2.2.5.so -lib/libtermcap.so.2.0.8 -lib/libc-2.2.5.so -lib/libnsl-2.2.5.so -lib/libnss_files-2.2.5.so diff --git a/regress/scripts/flist b/regress/scripts/flist deleted file mode 100644 index 87f103defe..0000000000 --- a/regress/scripts/flist +++ /dev/null @@ -1,23 +0,0 @@ -/build/configure -/build/src/stored/bextract -/build/src/tools/testfind -/build/Makefile.in -/build/src/dird/bacula-dir -/build/src/console/bconsole -/build/src/filed/bacula-fd -/build/src/findlib/find_one.c -/build/src/jcr.h -/build/platforms/Makefile.in -/build/platforms/redhat/Makefile.in -/build/scripts/Makefile.in -/build/src/win32/filed/winservice.cpp -/build/src/filed/restore.c -/build/autoconf/configure.in -/build/examples/afs-bacula -/build/src/win32/Makefile.inc.in -/build/src/win32/installer/winbacula.nsi -/build/autoconf/configure.in -/build/src/version.h -/build/src/lib/message.c -/build/src/lib/bnet_server.c -/build/src/lib/libbac.a diff --git a/regress/scripts/freebsd_tape_options b/regress/scripts/freebsd_tape_options deleted file mode 100644 index 05be3449c4..0000000000 --- a/regress/scripts/freebsd_tape_options +++ /dev/null @@ -1,8 +0,0 @@ -# -# FreeBSD tape drive options -# -Hardware End of Medium = no -Fast Forward Space File = no -BSF at EOM = yes -Backward Space Record = no -TWO EOF = yes diff --git a/regress/scripts/functions b/regress/scripts/functions deleted file mode 100644 index 7da6d38058..0000000000 --- a/regress/scripts/functions +++ /dev/null @@ -1,147 +0,0 @@ -# -# A set of useful functions to be sourced in each test -# - -start_test() -{ - echo " " - echo " " - echo " === Starting $TestName at `date +%R:%S` ===" - echo " === Starting $TestName at `date +%R:%S` ===" >>working/log - echo " " -} - -set_debug() -{ - debug=$1 - if test "$debug" -eq 1 ; then - out="tee" - else - out="output" - fi -} - -run_bacula() -{ - if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf - else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null - fi -} - -run_bconsole() -{ - if test "$debug" -eq 1 ; then - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf - else - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null - fi -} - -run_btape() -{ - if test "$debug" -eq 1 ; then - cat tmp/bconcmds | bin/btape -c bin/bacula-sd.conf DDS-4 | tee tmp/log1.out - else - cat tmp/bconcmds | bin/btape -c bin/bacula-sd.conf DDS-4 2>&1 >tmp/log1.out - fi -} - -run_bscan() -{ - if test "$debug" -eq 1 ; then - bin/bscan $* | tee tmp/log.out - else - bin/bscan $* 2>&1 >/dev/null - fi -} - - -stop_bacula() -{ - bin/bacula stop 2>&1 >/dev/null -} - -check_for_zombie_jobs() -{ - scripts/check_for_zombie_jobs $1 -} - -change_jobname() -{ - if test $# -eq 1; then - oldname=NightlySave - newname=$1 - else - oldname=$1 - newname=$2 - fi - rm -f bin/1 - mv bin/bacula-dir.conf bin/1 - echo "s%${oldname}%${newname}%g" >tmp/1 - sed -f tmp/1 bin/1 >bin/bacula-dir.conf -# echo "Job ${oldname} changed to ${newname}" -} - -check_two_logs() -{ - grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null - bstat=$? - grep "^ Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null - rstat=$? -} - -check_restore_diff() -{ - diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null - dstat=$? -} - -check_restore_tmp_build_diff() -{ - diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build 2>&1 >/dev/null - dstat=$? -} - -end_test() -{ - if [ $dstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then - echo " " - echo " " - echo " !!!!! $TestName Bacula source failed!!! !!!!! " - echo " !!!!! $TestName failed!!! !!!!! " >>test.out - if [ $bstat != 0 -o $rstat != 0 ] ; then - echo " !!!!! Bad Job termination status !!!!! " - echo " !!!!! Bad Job termination status !!!!! " >>test.out - else - echo " !!!!! Restored files differ !!!!! " - echo " !!!!! Restored files differ !!!!! " >>test.out - fi - echo " " - else - echo " ===== $TestName Bacula source OK `date +%R:%S` ===== " - echo " ===== $TestName OK `date +%R:%S` ===== " >>test.out - if test "$debug" -eq 0 ; then - scripts/cleanup - fi - fi -} - -copy_tape_confs() -{ - scripts/copy-tape-confs - scripts/cleanup-tape -} - -copy_test_confs() -{ - scripts/copy-test-confs - scripts/cleanup -} - - -# Save current directory -cwd=`pwd` diff --git a/regress/scripts/linux_osst_tape_options b/regress/scripts/linux_osst_tape_options deleted file mode 100644 index 5def0c08cb..0000000000 --- a/regress/scripts/linux_osst_tape_options +++ /dev/null @@ -1,7 +0,0 @@ - Minimum Block Size = 32768 - Maximum Block Size = 32768 - Hardware End of Medium = yes - BSF at EOM = yes - Fast Forward Space File = yes - Two EOF = no - diff --git a/regress/scripts/linux_tape_options b/regress/scripts/linux_tape_options deleted file mode 100644 index 601eb82aa5..0000000000 --- a/regress/scripts/linux_tape_options +++ /dev/null @@ -1 +0,0 @@ -# nothing needed for Linux diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in deleted file mode 100644 index f190724fc3..0000000000 --- a/regress/scripts/new-test-bacula-dir.conf.in +++ /dev/null @@ -1,342 +0,0 @@ -# -# Default Bacula Director Configuration file -# -# The only thing that MUST be changed is to add one or more -# file or directory names in the Include directive of the -# FileSet resource. -# -# For Bacula release 1.39 or later -# -# You might also want to change the default email address -# from root to your address. See the "mail" and "operator" -# directives in the Messages resource. -# - -Director { # define myself - Name = @hostname@-dir - DIRport = 8101 # where we listen for UA connections - QueryFile = "@scriptdir@/query.sql" - WorkingDirectory = "@working_dir@" - PidDirectory = "@piddir@" - SubSysDirectory = "@subsysdir@" - Maximum Concurrent Jobs = 4 - Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password - Messages = Standard -} - -# -# Define the main nightly save backup job -# By default, this job will back up to disk in /tmp -Job { - Name = "NightlySave" - Type = Backup - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" - Maximum Concurrent Jobs = 4 - SpoolData=yes -} - -Job { - Name = "MonsterSave" - Type = Backup - Client=@hostname@-fd - FileSet="Full Set" - Storage = File1 - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -Job { - Name = "VerifyVolume" - Type = Verify - Level = VolumeToCatalog - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -Job { - Name = "SparseTest" - Type = Backup - Client=@hostname@-fd - FileSet="SparseSet" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - -Job { - Name = "CompressedTest" - Type = Backup - Client=@hostname@-fd - FileSet="CompressedSet" - Storage = File - Messages = Standard - Pool = Default - Maximum Concurrent Jobs = 4 - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - -Job { - Name = "SparseCompressedTest" - Type = Backup - Client=@hostname@-fd - FileSet="SparseCompressedSet" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -# Backup the catalog database (after the nightly save) -Job { - Name = "BackupCatalog" - Type = Backup - Client=@hostname@-fd - FileSet="Catalog" -# Schedule = "WeeklyCycleAfterBackup" - Storage = File - Messages = Standard - Pool = Default - # This creates an ASCII copy of the catalog - RunBeforeJob = "@sbindir@/make_catalog_backup -u bacula" - # This deletes the copy of the catalog - RunAfterJob = "@sbindir@/delete_catalog_backup" - Write Bootstrap = "@working_dir@/BackupCatalog.bsr" -} - -JobDefs { - Name = "BackupJob" - Type = Backup - Pool = Default - Storage = File - Messages = Standard - Priority = 10 -} - -Job { - JobDefs = "BackupJob" - Name = "bug621-job-1" - Client = @hostname@-fd - FileSet="Full Set" - ClientRunBeforeJob = "/bin/sleep 60" -} - -Job { - JobDefs = "BackupJob" - Name = "bug621-job-2" - Client = @hostname@-fd - FileSet = "Full Set" - Max Run Time = 30 - Priority = 15 -} - - -# Standard Restore template, to be changed by Console program -Job { - Name = "RestoreFiles" - Type = Restore - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Where = /tmp/bacula-restores -} - - -# List of files to be backed up -FileSet { - Name = "Full Set" - Include { Options { signature=MD5 } - File = /tmp/file-list -if test ! -d ${cwd}/tmp/build ; then - mkdir ${cwd}/tmp/build -fi -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -# Turn off Prefer Mounted Volumes so we use 2 drives -outf="tmp/sed_tmp" -echo "s%# Prefer Mounted Volumes% Prefer Mounted Volumes%g" >${outf} -cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 -# Comment the next line out to write everything to one drive -# otherwise, it writes the two jobs to different drives -sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf - -# Write out bconsole commands -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 -status storage=DDS-4 -@#setdebug level=120 storage=DDS-4 -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -@sleep 3 -status storage=DDS-4 -wait -list volumes -list jobs -status storage=DDS-4 -messages -quit -END_OF_DATA - -run_bacula -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -@# Force Incremental on the second Volume -update volume=TestVolume001 VolStatus=Used -status storage=DDS-4 -@#setdebug level=120 storage=DDS-4 -run level=Incremental job=NightlySave yes -wait -list volumes -status storage=DDS-4 -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -# The restore should read from TestVolume002, which was on drive 1 -grep tmp/log2.out TestVolume002 -if [ $? != 0 ] ; then - rstat=$? -fi - -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c -check_restore_tmp_build_diff - -end_test diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape deleted file mode 100755 index a301c1ca55..0000000000 --- a/regress/tests/2drive-incremental-2tape +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do an Incremental and restore those two files. -# -# This script uses the autochanger and two tapes -# -. config.out -if test x${TAPE_DRIVE1} = x/dev/null ; then - echo "Skipping 2drive-incremenatal-2tape test. No second drive." - exit -fi -TestName="2drive-incremental-2tape" -JobName="2drive2tape" -. scripts/functions -set_debug 0 - -cwd=`pwd` - -scripts/copy-2drive-confs -scripts/cleanup-2drive - -change_jobname localhost-fd $JobName - -echo "${cwd}/tmp/build" >/tmp/file-list -if test ! -d ${cwd}/tmp/build ; then - mkdir ${cwd}/tmp/build -fi -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -# Turn off Prefer Mounted Volumes so we use 2 drives -outf="tmp/sed_tmp" -echo "s%# Prefer Mounted Volumes% Prefer Mounted Volumes%g" >${outf} -cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 -# Comment the next line out to write everything to one drive -# otherwise, it writes the two jobs to different drives -sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf - -start_test - -# Write out bconsole commands -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 -@#setdebug level=100 storage=DDS-4 -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -@sleep 3 -status storage=DDS-4 -wait -list volumes -list jobs -status storage=DDS-4 -messages -quit -END_OF_DATA - -run_bacula - -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -@# Force Incremental on the second Volume -update volume=TestVolume001 VolStatus=Used -status storage=DDS-4 -@#setdebug level=400 storage=DDS-4 -run level=Incremental job=NightlySave yes -wait -list volumes -status storage=DDS-4 -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c -check_restore_tmp_build_diff - -end_test diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test deleted file mode 100755 index 6583937e03..0000000000 --- a/regress/tests/auto-label-test +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# Test if Bacula can automatically create a Volume label. -# - -TestName="auto-label-test" -JobName=AutoLabel -. scripts/functions -set_debug 0 -copy_test_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 -sed "s%# Label Format% Label Format%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -status all -status all -list pools -messages -@#setdebug level=110 storage=File -run job=$JobName storage=File yes -list pools -list volumes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File -unmark * -mark * -count -ls * -dir * -find Makefile -pwd -lsmark -estimate -? -help -done -yes -wait -messages -@$out -quit -END_OF_SCRIPT - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape deleted file mode 100755 index 21d521d563..0000000000 --- a/regress/tests/backup-bacula-tape +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# We also use the purge and the relabel commands as -# well as a pile of status storage commands. -# -TestName="backup-bacula-tape" -JobName=backuptape -. scripts/functions -set_debug 0 - -scripts/copy-tape-confs -scripts/cleanup-tape - -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - - -# Write out bconsole commands -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -@#setdebug level=200 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -purge volume=TestVolume001 -relabel pool=Default storage=DDS-4 oldVolume=TestVolume001 volume=TestVolume002 slot=0 -purge volume=TestVolume002 -relabel pool=Default storage=DDS-4 oldVolume=TestVolume002 volume=TestVolume001 slot=0 -run job=$JobName yes -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -@sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -@sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -@sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -@sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -list volumes -messages -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -# -# Now do a second backup after making a few changes -# -touch ${cwd}/build/src/dird/*.c -echo "test test" > ${cwd}/build/src/dird/xxx - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -list volumes -run job=$JobName yes -wait -list volumes -messages -@# -@# now do a second restore -@# -@$out tmp/log2.out -list volumes -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -list volumes -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test deleted file mode 100755 index 7f50f4674c..0000000000 --- a/regress/tests/backup-bacula-test +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -TestName="backup-bacula-test" -JobName=backup -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-confs - -change_jobname Client1 $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label volume=TestVolume001 -@#setdebug level=100 storage=File -run job=$JobName yes -status storage=File -status storage=File -status storage=File -status storage=File -status storage=File -status storage=File -@sleep 1 -status storage=File -status storage=File -status storage=File -status storage=File -status storage=File -@sleep 1 -status storage=File -status storage=File -status storage=File -status storage=File -status storage=File -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape deleted file mode 100755 index f6f6c3b0c0..0000000000 --- a/regress/tests/backup-win32-tape +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# -TestName="backup-win32-tape" -JobName=backupwintape -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-win32-confs - -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=NightlySave yes -@sleep 10 -status storage=DDS-4 -@sleep 30 -messages -wait -messages -@# -@# now do a restore -@# -@$outt tmp/log2.out -@#restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -@#yes -@#wait -@#messages -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test deleted file mode 100755 index 904a39223b..0000000000 --- a/regress/tests/bextract-test +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory but -# split the archive into two volumes, then build a BSR with -# the restore command and use bextract to restore the files. -# -TestName="bextract-test" -JobName="bextract" -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File1 volume=TestVolume001 -label storage=File1 volume=TestVolume002 -update Volume=TestVolume001 MaxVolBytes=3000000 -@#setdebug level=400 dir -@#setdebug level=400 storage=File1 -run job=$JobName storage=File1 yes -wait -messages -@# -@# now build the bsr file -@# -@$out tmp/log2.out -restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done -no -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File1 -stop_bacula - -mkdir -p ${cwd}/tmp/bacula-restores -bin/bextract -b working/restore.bsr -c bin/bacula-sd.conf ${cwd}/tmp ${cwd}/tmp/bacula-restores 2>&1 >/dev/null -rstat=$? -grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null -bstat=$? -check_restore_diff -end_test diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape deleted file mode 100755 index 2c8121896d..0000000000 --- a/regress/tests/bscan-fast-tape +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then -# do a bscan and restore. -# It should require at least 4 different bsrs. -# -TestName="bscan-tape" -JobName=bscantape -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -# sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -setdebug level=2 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -echo "Starting Bacula tape writing" -#bin/btape -c bin/bacula-sd.conf /dev/nst0 </dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. - -echo "Begin attempt to read tape that crashes the system" -echo "volume=TestVolume001" >tmp/bscan.bsr -strace -o strace.new bin/bscan -d200 -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 -exit -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log2.out -@# -@# now do a restore -@# -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula -rm -f ${cwd}/build/src/lib/dummy - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape deleted file mode 100755 index 7f7e708c1e..0000000000 --- a/regress/tests/bscan-tape +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then -# do a bscan and restore. -# It should require at least 4 different bsrs. -# -TestName="bscan-tape" -JobName=bscantape -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -estimate job=$JobName listing -estimate job=$JobName listing -estimate job=$JobName listing -messages -@$out tmp/log1.out -setdebug level=2 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -run job=$JobName level=Full yes -wait -run job=$JobName level=Full yes -wait -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 - -echo "Backup 1 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o - -# -# run a second job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA - -run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 - -echo "Backup 2 done" -touch ${cwd}/build/src/dird/*.c -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -# -# run a third job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA - -run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 - -echo "Backup 3 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -#echo "abc" > ${cwd}/build/src/lib/dummy -# -# run a fourth job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA - -run_bacula - -scripts/check_for_zombie_jobs storage=DDS-4 -stop_bacula - -echo "Backup 4 done" -# -# now drop and recreate the database -# -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. - -echo "volume=TestVolume001" >tmp/bscan.bsr -bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 2>&1 >/dev/null - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log2.out -@# -@# now do a restore -@# -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula -rm -f ${cwd}/build/src/lib/dummy - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test deleted file mode 100755 index 91fa8598a2..0000000000 --- a/regress/tests/bscan-test +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory but -# split the archive into two volumes then bscan it -# into the catalog after the backup. It also to a limited -# extent tests the purge volume and delete volume commands. -# - -TestName="bscan-test" -JobName=bscan -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File1 -TestVolume001 -label storage=File1 -TestVolume002 -update Volume=TestVolume001 MaxVolBytes=3000000 -run job=$JobName storage=File1 -yes -wait -messages -@$out /dev/null -@# -@# now purge the Volume -@# -purge volume=TestVolume001 -purge volume=TestVolume002 -delete volume=TestVolume001 -yes -delete volume=TestVolume002 -yes -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File1 -stop_bacula - -echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr - -if test "$debug" -eq 1 ; then - bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp -else - bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null -fi - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log2.out -@# -@# now do a restore -@# -@#setdebug level=400 storage=File1 -restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores select all storage=File1 done -yes -wait -messages -@$out -quit -END_OF_DATA - -# now run restore -run_bacula -check_for_zombie_jobs storage=File1 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test deleted file mode 100755 index c2dfd74241..0000000000 --- a/regress/tests/bsr-opt-test +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory but -# split the archive into two volumes, then restore -# files on only one of the volumes and ensure that -# the other volume is not used. I.e. bsr optimization -# works. -# -TestName="bsr-opt-test" -JobName=bsr-opt -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File1 volume=TestVolume001 -label storage=File1 volume=TestVolume002 -update Volume=TestVolume001 MaxVolBytes=3000000 -run job=$JobName storage=File1 yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select storage=File1 -unmark * -cd ${cwd}/build/src/cats -mark * -ls -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File1 -stop_bacula -# -# This test is not really reliable. What we want to do is -# to select files on only one Volume, then insure here -# that only one Volume is chosen. -# -grep TestVolume002 working/restore.bsr 2>&1 >/dev/null -bsrstat=$? -check_two_logs - -diff -r build/src/cats tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null -if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then - echo " " - echo " " - echo " !!!!! bsr-opt-test Bacula source failed!!! !!!!! " - echo " !!!!! bsr-opt-test failed!!! !!!!! " >>test.out - if [ $bstat != 0 -o $rstat != 0 ] ; then - echo " !!!!! Bad Job termination status !!!!! " - echo " !!!!! Bad Job termination status !!!!! " >>test.out - elif [ $bsrstat != 0 ] ; then - echo " !!!!! Volume selection error !!!!! " - echo " !!!!! Volume selection error !!!!! " >>test.out - else - echo " !!!!! Restored files differ !!!!! " - echo " !!!!! Restored files differ !!!!! " >>test.out - fi - echo " " -else - echo " ===== bsr-opt-test Bacula source OK `date +%R:%S` ===== " - echo " ===== bsr-opt-test OK `date +%R:%S` ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/tests/btape-fill-full-tape b/regress/tests/btape-fill-full-tape deleted file mode 100755 index f4ba59fb5b..0000000000 --- a/regress/tests/btape-fill-full-tape +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Test the fill command in btape -# -TestName="btape-fill-full-tape" -JobName=AutoLabel -. scripts/functions -set_debug 0 - -scripts/copy-tape-confs -scripts/cleanup-tape - -change_jobname $JobName -start_test - -bin/btape -c bin/bacula-sd.conf DDS-4 <&1 >tmp/log1.out -fill -s - -quit -END_OF_DATA - - -grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null -if [ $? != 0 ] ; then - echo " " - echo " " - echo " !!!!! btape fill test failed!!! !!!!! " - echo " !!!!! btape fill test failed!!! !!!!! " >>test.out - echo " " -else - echo " ===== btape fill test OK ===== " - echo " ===== btape fill test OK ===== " >>test.out -# scripts/cleanup -fi diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape deleted file mode 100755 index b3fb4e5afd..0000000000 --- a/regress/tests/btape-fill-tape +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# Test the fill command in btape -# -TestName="btape-fill-tape" -JobName=filltape -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# MaximumVolumeSize% MaximumVolumeSize%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -start_test - -cat <tmp/bconcmds -fill -s -quit -END_OF_DATA - -run_btape DDS-4 - -grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null -if [ $? != 0 ] ; then - echo " " - echo " " - echo " !!!!! btape fill test failed!!! !!!!! " - echo " !!!!! btape fill test failed!!! !!!!! " >>test.out - echo " " -else - echo " ===== btape fill test OK ===== " - echo " ===== btape fill test OK ===== " >>test.out -# scripts/cleanup -fi diff --git a/regress/tests/compress-encrypt-test b/regress/tests/compress-encrypt-test deleted file mode 100755 index 265512bc22..0000000000 --- a/regress/tests/compress-encrypt-test +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Run a simple backup with encryption and compression of the Bacula build directory -# then verify the signatures. -# -TestName="compressed-encrypt-test" -JobName=CompressedTest -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-crypto-confs -echo "${cwd}/build" >/tmp/file-list - -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -setdebug level=10 fd -run job=$JobName yes -wait -messages -list volumes -@# -@# now do a restore -@# -@$out tmp/log2.out -@# setdebug level=0 fd -restore where=${cwd}/tmp/bacula-restores storage=File -5 -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -sleep 2 -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test deleted file mode 100755 index ff92a49dc2..0000000000 --- a/regress/tests/compressed-test +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then restore it. -# -TestName="compressed-test" -JobName=compressed -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@output -messages -@$out tmp/log1.out -status all -status all -messages -label storage=File volume=TestVolume001 -run job=$JobName storage=File yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test deleted file mode 100755 index 1cb0580ce9..0000000000 --- a/regress/tests/concurrent-jobs-test +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# Run two jobs at the same time -# - -TestName="concurrent-jobs-test" -JobName=concurrent-jobs -. scripts/functions -set_debug 0 - -copy_test_confs - -echo "${cwd}/tmp/largefile" >/tmp/file-list -if test -c /dev/urandom ; then -# Create 56MB file with random data - echo "Creating a 56MB file with random data ..." - dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000 -else - echo "Creating a 56MB file with bacula-dir data ..." - dd if=bin/bacula-dir of=${cwd}/tmp/1 bs=1024 count=1000 - cat ${cwd}/tmp/1 ${cwd}/tmp/1 ${cwd}/tmp/1 ${cwd}/tmp/1 ${cwd}/tmp/1 >${cwd}/tmp/2 - rm -f ${cwd}/tmp/1 - cat ${cwd}/tmp/2 ${cwd}/tmp/2 ${cwd}/tmp/2 ${cwd}/tmp/2 ${cwd}/tmp/2 >>${cwd}/tmp/3 - rm -f ${cwd}/tmp/2 - cat ${cwd}/tmp/3 ${cwd}/tmp/3 ${cwd}/tmp/3 ${cwd}/tmp/3 ${cwd}/tmp/3 >${cwd}/tmp/largefile - rm -f ${cwd}/tmp/3 -fi - -echo "largefile created" - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName level=Full yes -run job=$JobName level=Full yes -run job=$JobName level=Full yes -run job=$JobName level=Full yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -diff tmp/largefile tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null -dstat=$? -end_test diff --git a/regress/tests/data-encrypt-test b/regress/tests/data-encrypt-test deleted file mode 100755 index d184c9737b..0000000000 --- a/regress/tests/data-encrypt-test +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# Run a simple backup with encryption and no other options -# (i.e. no compression and no sparse handling) of the -# Bacula build directory. -# -TestName="data-encrypt-test" -JobName=Crypto -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-crypto-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -@#setdebug level=10 fd -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -@#setdebug level=10 fd -restore where=${cwd}/tmp/bacula-restores storage=File -5 -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -sleep 2 -check_for_zombie_jobs storage=File -stop_bacula - -du -s build -du -s tmp/bacula-restores/ - - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root deleted file mode 100755 index 26ae6fee84..0000000000 --- a/regress/tests/dev-test-root +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -MUID=`/usr/bin/id -u` -if [ $MUID != 0 ] ; then - echo " " - echo "You must be root to run this test." - echo " ===== !!!! dev-test-root not run !!!! ===== " - echo " ===== !!!! dev-test-root not run !!!! ===== " >>test.out - echo " " - exit 1 -fi -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "/dev" >/tmp/file-list - -echo " " -echo " " -echo " === Starting dev-test-root test ===" -echo " " -echo " === Note, this test can fail for trivial ===" -echo " === reasons on non-Linux systems. ===" -echo " " -echo " " - -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test dev >${cwd}/tmp/original -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test dev >${cwd}/tmp/restored -cd ${cwd}/tmp -# -# Use sed to cut out parts that *always* change -# -cat >sed.scr <1 -sed -f sed.scr 1 | sort >original -# -mv -f restored 1 -sed -f sed.scr 1 | sort >restored -rm -f sed.scr -# -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/null -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== !!!! dev-test-root failed !!!! ===== " - echo " ===== !!!! dev-test-root failed !!!! ===== " >>test.out - echo " " -else - echo " ===== dev-test-root OK ===== " - echo " ===== dev-test-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/tests/differential-test b/regress/tests/differential-test deleted file mode 100755 index 4949bfe6d8..0000000000 --- a/regress/tests/differential-test +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do a differential and restore those two files. -# -TestName="differential-test" -JobName=differential -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list -mkdir ${cwd}/tmp/build -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume002 -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bacula - -scripts/check_for_zombie_jobs storage=File -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -@# Force differential on the second Volume -update volume=TestVolume002 VolStatus=Used -run level=differential job=$JobName yes -wait -messages -@$out -END_OF_DATA - -run_bconsole - -scripts/check_for_zombie_jobs storage=File -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run level=incremental job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole -scripts/check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -# -# Delete .c files because we will only restore the txt files -# -rm -f tmp/build/*.c -check_restore_tmp_build_diff -end_test diff --git a/regress/tests/eot-fail-tape b/regress/tests/eot-fail-tape deleted file mode 100755 index 4907e8dca6..0000000000 --- a/regress/tests/eot-fail-tape +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to two tapes where the maximum tape file size is set to 1M -# -TestName="eot-fail-tape" -JobName=eotfailtape -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-tape-confs - -echo "${cwd}/build" >/tmp/file-list - -out="tmp/sed_tmp" -echo "s%# Maximum File Size% Maximum File Size%g" >${out} -cp -f ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -update Volume=TestVolume001 MaxVolBytes=3000000 -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@tee -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root deleted file mode 100755 index e3a4495b88..0000000000 --- a/regress/tests/etc-test-root +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -MUID=`/usr/bin/id -u` -if [ $MUID != 0 ] ; then - echo " " - echo "You must be root to run this test." - echo " ===== !!!! etc-test-root not run !!!! ===== " - echo " ===== !!!! etc-test-root not run !!!! ===== " >>test.out - echo " " - exit 1 -fi -echo " " -echo " " -echo " === Starting /etc save/restore test ===" -echo " " -echo " " -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "/etc" >/tmp/file-list - -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test etc >${cwd}/tmp/1 -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test etc >${cwd}/tmp/2 -sort <${cwd}/tmp/1 >${cwd}/tmp/original -sort <${cwd}/tmp/2 >${cwd}/tmp/restored -rm -f ${cwd}/tmp/1 ${cwd}/tmp/2 -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/null -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== !!!! etc-test-root failed !!!! ===== " - echo " ===== !!!! etc-test-root failed !!!! ===== " >>test.out - echo " " -else - echo " ===== etc-test-root OK ===== " - echo " ===== etc-test-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/tests/fixed-block-size-tape b/regress/tests/fixed-block-size-tape deleted file mode 100755 index 10de2c45e5..0000000000 --- a/regress/tests/fixed-block-size-tape +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape where we set the minimum and maximum block -# sizes. -# -TestName="fixed-block-size-tape" -JobName=fixedblocksize -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -echo "s%# Maximum Block Size% Maximum Block Size%" >${cwd}/tmp/2 -echo "s%# Minimum Block Size% Minimum Block Size%" >>${cwd}/tmp/2 -sed -f ${cwd}/tmp/2 ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf -if [ $? != 0 ] ; then - echo " " - echo " " - echo "!!!! sed problem in Fixed Block Size test !!!!!" - echo " " - exit 1 -fi -rm -f ${cwd}/tmp/1 ${cwd}/tmp/2 - -change_jobname NightlySave $JobName -start_test - - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape deleted file mode 100755 index 0d0918f62b..0000000000 --- a/regress/tests/four-concurrent-jobs-tape +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Run four jobs at the same time -# -TestName="four-concurrent-jobs-tape" -JobName=FourConcurrentJobs -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-tape-confs - -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -@sleep 2 -status dir -@sleep 5 -status dir -status storage=DDS-4 -messages -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test deleted file mode 100755 index bd7e20f885..0000000000 --- a/regress/tests/four-concurrent-jobs-test +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# Run two jobs at the same time -# -TestName="four-concurrent-jobs-test" -JobName=Four-concurrent-jobs -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File1 -TestVolume001 -label storage=File1 -TestVolume002 -update Volume=TestVolume001 MaxVolBytes=100000000 -@#50000000 -@#12 -run job=$JobName level=Full Storage=File1 -yes -reload -run job=$JobName level=Full Storage=File1 -yes -reload -run job=$JobName level=Full Storage=File1 -yes -reload -run job=$JobName level=Full Storage=File1 -yes -reload -reload -reload -reload -@sleep 2 -status dir -reload -@sleep 5 -messages -reload -reload -wait -reload -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File1 -unmark * -mark * -done -yes -wait -reload -reload -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File1 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape deleted file mode 100755 index 4252ba2d7e..0000000000 --- a/regress/tests/four-jobs-tape +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then finally restore. -# It should require at least 4 different bsrs. -# -TestName="four-jobs-tape" -JobName=fourjobstape -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -estimate job=$JobName listing -estimate job=$JobName listing -estimate job=$JobName listing -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -messages -quit -END_OF_DATA -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi - -scripts/check_for_zombie_jobs storage=DDS-4 -echo "Backup 1 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o - -# -# run a second job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi - -scripts/check_for_zombie_jobs storage=DDS-4 -echo "Backup 2 done" -touch ${cwd}/build/src/dird/*.c -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -# -# run a third job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi - -scripts/check_for_zombie_jobs storage=DDS-4 -echo "Backup 3 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -# -# run a fourth job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi - -scripts/check_for_zombie_jobs storage=DDS-4 -echo "Backup 4 done" -# -# now do several restores to ensure we cleanup between jobs -# -cat <tmp/bconcmds -@$out /dev/null -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -@$out tmp/log2.out -@# -@# now unmount the tape and start two restores -@# at the same time -@# -unmount storage=DDS-4 -restore where=${cwd}/tmp/bacula-restores select all done -yes -restore where=${cwd}/tmp/bacula-restores select -unmark * -mark * -done -yes -mount storage=DDS-4 -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test deleted file mode 100755 index 20fdc05fca..0000000000 --- a/regress/tests/four-jobs-test +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then finally restore. -# It should require at least 4 different bsrs. -# -TestName="four-jobs-test" -JobName=SpanVol -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -estimate job=$JobName listing -estimate job=$JobName listing -estimate job=$JobName listing -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -echo "Backup 1 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o - -# -# run a second job -# -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run job=$JobName -yes -wait -messages -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=File - -echo "Backup 2 done" -touch ${cwd}/build/src/dird/*.c -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -# -# run a third job -# -cat <tmp/bconcmds -@output /dev/null -messages -@output tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=File - -echo "Backup 3 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -# -# run a fourth job -# -cat <tmp/bconcmds -@output /dev/null -messages -@output tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=File - -echo "Backup 4 done" -# -# now do several restores to ensure we cleanup between jobs -# -cat <tmp/bconcmds -@output /dev/null -restore where=${cwd}/tmp/bacula-restores select all storage=File done -yes -wait -restore where=${cwd}/tmp/bacula-restores select all storage=File done -yes -wait -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/gigaslam-sparse-test b/regress/tests/gigaslam-sparse-test deleted file mode 100755 index f638735205..0000000000 --- a/regress/tests/gigaslam-sparse-test +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the Sparse option -# then restore it. -# -TestName="gigaslam-sparse-test" -JobName=SparseTest -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list -cd ${cwd}/build/src/tools -./gigaslam -if [ $? != 0 ]; then - echo "Execute of ${cwd}/build/src/tools/gigaslam failed." - rm -f ${cwd}/build/src/tools/gigaslam.gif - exit 1 -fi -cd ${cwd} - -start_test - -cat >tmp/bconcmds </tmp/file-list -echo "${cwd}/weird-files" >>/tmp/file-list - -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File -TestVolume001 -run job=$JobName -yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=File -5 -cd ${cwd}/weird-files/subdir -mark another-hardlink -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -diff ${cwd}/weird-files/subdir/another-hardlink \ - ${cwd}/tmp/bacula-restores/${cwd}/weird-files/subdir/another-hardlink 2>&1 >/dev/null -dstat=$? -end_test diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk deleted file mode 100755 index a2227f79bb..0000000000 --- a/regress/tests/incremental-2disk +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do an Incremental and restore those two files. -# -# This script uses the virtual disk autochanger -# -TestName="incremental-2disk" -JobName=Inc2disk -. scripts/functions -set_debug 0 - -. config.out - -stop_bacula -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. - -scripts/copy-2disk-confs -scripts/prepare-two-disks - -echo "${cwd}/tmp/build" >/tmp/file-list -if test ! -d ${cwd}/tmp/build ; then - mkdir ${cwd}/tmp/build -fi -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -change_jobname $JobName -start_test - -# Write out bconsole commands -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0 -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bacula - -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -@# Force Incremental on the second Volume -update volume=TestVolume001 VolStatus=Used -run level=Incremental job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole - -check_for_zombie_jobs storage=File -stop_bacula -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c - -check_two_logs -check_restore_tmp_build_diff -end_test diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape deleted file mode 100755 index 1ee97cd49c..0000000000 --- a/regress/tests/incremental-2tape +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do an Incremental and restore those two files. -# -# This script uses the autochanger and two tapes -# -. config.out -if test x${AUTOCHANGER} = x/dev/null ; then - echo "incremental-2tape test skipped. No autochanger." - exit -fi -debug=0 -if test "$debug" -eq 1 ; then - out="tee" -else - out="output" -fi -cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. - -scripts/copy-2tape-confs -scripts/cleanup-2tape -echo "${cwd}/tmp/build" >/tmp/file-list -if test ! -d ${cwd}/tmp/build ; then - mkdir ${cwd}/tmp/build -fi -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -echo " " -echo " " -echo " === Starting incremental-2tape test ===" -echo " === Starting incremental-2tape test ===" >>working/log -echo " " - -# Write out bconsole commands -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0 -run job=NightlySave yes -wait -messages -quit -END_OF_DATA - -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null -bstat=$? -grep "^ Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null -rstat=$? -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c -diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build 2>&1 >/dev/null -if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then - echo " " - echo " " - echo " !!!!! incremental-2tape test Bacula source failed!!! !!!!! " - echo " !!!!! incremental-2tape test failed!!! !!!!! " >>test.out - echo " " -else - echo " ===== incremental-2tape test Bacula source OK ===== " - echo " ===== incremental-2tape test OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape deleted file mode 100755 index 3b7264da77..0000000000 --- a/regress/tests/incremental-tape +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do an Incremental and restore those two files. -# -TestName="incremental-tape" -JobName=IncTape -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/tmp/build" >/tmp/file-list -if test ! -d ${cwd}/tmp/build ; then - mkdir ${cwd}/tmp/build -fi -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 - -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=Incremental job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@output -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c - -check_two_logs -check_restore_tmp_build_diff -end_test diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test deleted file mode 100755 index 80ac6ee7ee..0000000000 --- a/regress/tests/incremental-test +++ /dev/null @@ -1,170 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do an Incremental and restore those two files. -# -TestName="incremental-test" -JobName=Incremental -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list -mkdir ${cwd}/tmp/build -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -label storage=File volume=TestVolume002 -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -# -# Now create two new files to be restored later -# -sleep 1 -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -cp -f ${cwd}/tmp/build/dird.c ${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -@# Force Incremental on the second Volume -update volume=TestVolume001 VolStatus=Used -run level=Differential job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole - -sleep 1 -touch ${cwd}/tmp/build/ficheriro1.txt -touch ${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=Incremental job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole - -sleep 1 -cd ${cwd}/tmp/build -cp -f ficheriro2.txt 1 -sed "s%a%b%g" 1 >ficheriro2.txt -rm -f 1 -cd ${cwd} -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=Differential job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole - -sleep 1 -touch ${cwd}/tmp/build/ficheriro1.txt -touch ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=Incremental job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole - -sleep 1 -touch ${cwd}/tmp/build/ficheriro1.txt -touch ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=Incremental job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole - -sleep 1 -touch ${cwd}/tmp/build/ficheriro1.txt -touch ${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=Incremental job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole -sleep 1 -touch ${cwd}/tmp/build/ficheriro1.txt -touch ${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=Incremental job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@output tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list -yes -wait -messages -@output -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c -check_restore_tmp_build_diff -end_test diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root deleted file mode 100755 index 06289cd1d4..0000000000 --- a/regress/tests/lib-tape-root +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the /lib directory -# then restore it. -# -cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. - -scripts/cleanup-tape -scripts/copy-tape-confs -echo "/lib" >/tmp/file-list -echo " " -echo " " -echo " === Starting lib-tape-root test ===" -echo " " -echo " " -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/original -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/restored -cd ${cwd}/tmp -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% original >1 -sort <1 >original -# -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% restored >1 -sort <1 >restored -rm -f 1 -# -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/nul -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== lib-tape-root failed!!! ===== " - echo " ===== lib-tape-root failed!!! ===== " >>test.out - echo " " -else - echo " ===== lib-tape-root OK ===== " - echo " ===== lib-tape-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root deleted file mode 100755 index 4f41954a29..0000000000 --- a/regress/tests/lib-test-root +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -MUID=`/usr/bin/id -u` -if [ $MUID != 0 ] ; then - echo " " - echo "You must be root to run this test." - echo " ===== !!!! lib-test-root not run !!!! ===== " - echo " ===== !!!! lib-test-root not run !!!! ===== " >>test.out - echo " " - exit 1 -fi -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "/lib" >/tmp/file-list - -echo " " -echo " " -echo " === Starting /lib save/restore test ===" -echo " " -echo " " - -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-lib-test lib >${cwd}/tmp/original -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-lib-test lib >${cwd}/tmp/restored -cd ${cwd}/tmp -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% original >1 -sort <1 >original -# -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% restored >1 -sort <1 >restored -rm -f 1 -# -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/nul -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== !!!! lib-test-root failed !!!! ===== " - echo " ===== !!!! lib-test-root failed !!!! ===== " >>test.out - echo " " -else - echo " ===== lib-test-root OK ===== " - echo " ===== lib-test-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test deleted file mode 100755 index 0b6cb19691..0000000000 --- a/regress/tests/migration-job-test +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then migrate it -# to another device. -# -# This script uses the virtual disk autochanger -# -TestName="migration-job-test" -JobName=MigrationJobSave -. scripts/functions -set_debug 0 - -. config.out - -scripts/cleanup -scripts/copy-migration-confs -scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -# -# Note, we first backup into Pool Default, -# then Migrate into Pool Full. -# Pool Default uses Storage=File -# Pool Full uses Storage=DiskChanger - -# Write out bconsole commands -cat <tmp/bconcmds -@output -messages -@$out tmp/log1.out -label storage=File volume=FileVolume001 Pool=Default -label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0 -label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0 -@# run two jobs (both will be migrated) -run job=$JobName yes -run job=$JobName yes -wait -list jobs -list volumes -@#setdebug level=100 dir -@# should migrate two jobs -run job=migrate-job yes -wait -messages -@# purge volume=FileVolume001 -list jobs -list volumes -wait -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test deleted file mode 100755 index 63a8ce1e0f..0000000000 --- a/regress/tests/migration-jobspan-test +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then migrate it -# to another device. -# -# Test migrating a job that spans two Volumes -# -# This script uses the virtual disk autochanger -# -TestName="migration-jobspan-test" -JobName=MigrationJobSpanSave -. scripts/functions -set_debug 0 - -. config.out - -scripts/cleanup -scripts/copy-migration-confs -scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - - -change_jobname NightlySave $JobName -start_test - -# -# Note, we first backup into Pool Default, -# then Migrate into Pool Full. -# Pool Default uses Storage=File -# Pool Full uses Storage=DiskChanger - -# Write out bconsole commands -cat <tmp/bconcmds -@output -messages -@$out tmp/log1.out -@#setdebug level=10 dir -@#setdebug level=100 storage=File -label storage=File volume=FileVolume001 Pool=Default -label storage=File volume=FileVolume002 Pool=Default -update Volume=FileVolume001 MaxVolBytes=3000000 pool=Default -label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0 -label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0 -list volumes -@# -run job=$JobName yes -@#run job=$JobName yes -wait -list volumes -@#setdebug level=200 dir -@# should migrate both Volumes -run job=migrate-job yes -wait -purge volume=FileVolume001 -purge volume=FileVolume002 -list volumes -list jobs -messages -wait -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/migration-occupancy-test b/regress/tests/migration-occupancy-test deleted file mode 100755 index aed2298afa..0000000000 --- a/regress/tests/migration-occupancy-test +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then migrate it -# to another device. -# -# This script uses the virtual disk autochanger -# -TestName="migration-occupancy-test" -JobName=MigrationJobSave -. scripts/functions -set_debug 0 - -. config.out - -scripts/cleanup -scripts/copy-migration-confs -scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -# -# Note, we first backup into Pool Default, -# then Migrate into Pool Full. -# Pool Default uses Storage=File -# Pool Full uses Storage=DiskChanger - -# Write out bconsole commands -cat <tmp/bconcmds -@output -messages -@$out tmp/log1.out -label storage=File volume=FileVolume001 Pool=Default -label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0 -label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0 -list volumes -@# run two jobs (both will be migrated) -run job=$JobName yes -run job=$JobName yes -wait -update volume=FileVolume001 VolStatus=Used -list volumes -@# should migrate two jobs -run job=migrate-occupancy yes -list volumes -wait -messages -purge volume=FileVolume001 -wait -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test deleted file mode 100755 index 1adbb0e6d1..0000000000 --- a/regress/tests/migration-time-test +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then migrate it -# to another device. -# -# This script uses the virtual disk autochanger -# -TestName="migration-time-test" -JobName=MigrationJobSave -. scripts/functions -set_debug 0 - -. config.out - -scripts/cleanup -scripts/copy-migration-confs -scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -# -# Note, we first backup into Pool Default, -# then Migrate into Pool Full. -# Pool Default uses Storage=File -# Pool Full uses Storage=DiskChanger - -# Write out bconsole commands -cat <tmp/bconcmds -@output -messages -@$out tmp/log1.out -label storage=File volume=FileVolume001 Pool=Default -label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0 -label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0 -list volumes -@# run three jobs -run job=$JobName level=Full yes -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 -@# should migrate only jobid=2 and 3 -run job=migrate-time yes -wait -messages -wait -purge volume=FileVolume001 -list jobs -list volumes -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test deleted file mode 100755 index bdcc87fcab..0000000000 --- a/regress/tests/migration-volume-test +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# Run a backup of the Bacula build directory on two Volumes -# then migrate it to another device. -# -# This script uses the virtual disk autochanger -# -TestName="migration-volume-test" -JobName=MigVolBackup -. scripts/functions -set_debug 0 - -. config.out - -scripts/cleanup -scripts/copy-migration-confs -scripts/prepare-two-disks -echo "${cwd}/build" >/tmp/file-list -#cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -#sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -# -# Note, we first backup into Pool Default, -# then Migrate into Pool Full. -# Pool Default uses Storage=File -# Pool Full uses Storage=DiskChanger - -# Write out bconsole commands -cat <tmp/bconcmds -@output -messages -@$out tmp/log1.out -label storage=File volume=FileVolume001 Pool=Default -label storage=File volume=FileVolume002 Pool=Default -update Volume=FileVolume001 MaxVolBytes=3000000 pool=Default -label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0 -label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0 -@# -run job=$JobName yes -wait -run job=$JobName yes -wait -update volume=FileVolume001 VolStatus=Used -update volume=FileVolume002 VolStatus=Used -@#list volumes -@#list jobs -@# should migrate two jobs -@# setdebug level=11 dir -@echo "Run migrate-volume Job" -@#setdebug level=100 dir -run job=migrate-volume yes -@sleep 5 -list jobs -llist jobid=1 -llist jobid=2 -llist jobid=3 -llist jobid=4 -llist jobid=5 -status storage=DiskChanger -wait -list volumes -list jobs -llist jobid=1 -llist jobid=2 -llist jobid=3 -llist jobid=4 -llist jobid=5 -sql -select * from JobMedia where JobId=1; - -@# Now run a second Migration job, which should do nothing -run job=migrate-volume yes -wait -list jobs -@# ensure we don't pickup old backup by purging volume -@# purge volume=FileVolume001 -@# purge volume=FileVolume002 -@echo "Now do a restore" -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DiskChanger -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -exit - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/query-test b/regress/tests/query-test deleted file mode 100755 index 43b450bc6e..0000000000 --- a/regress/tests/query-test +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do a Differental then a bunch of query commands -# and finally restore the two files. -# -TestName="query-test" -JobName=query -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list -mkdir ${cwd}/tmp/build -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -label storage=File volume=TestVolume002 -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File - -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -@# Force differental on the second Volume -update volume=TestVolume001 VolStatus=Used -run level=differental job=$JobName yes -wait -messages -@output -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File - -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=incremental job=$JobName yes -wait -messages -@# -@# Now do the queries -@# -query -1 -ficheriro1.txt -query -2 -${cwd}/tmp/build/ -ficheriro1.txt -localhost-fd -query -6 -TestVolume001 -query -7 -1 -query -8 -localhost-fd -query -9 -Default -query -10 -query -11 -query -12 -1 -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c - -check_two_logs -check_restore_tmp_build_diff -end_test diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test deleted file mode 100755 index 244b0df2da..0000000000 --- a/regress/tests/recycle-test +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory but -# create three volumes and do six backups causing the -# volumes to be recycled, and cycling through the volumes -# twice. Tests maxvoljobs and volretention. -# -TestName="recycle-test" -JobName=Recycle -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File1 volume=TestVolume001 -label storage=File1 volume=TestVolume002 -label storage=File1 volume=TestVolume003 -update Volume=TestVolume001 volretention=10s -update Volume=TestVolume001 maxvoljobs=1 -update Volume=TestVolume002 volretention=10s -update Volume=TestVolume002 maxvoljobs=1 -update Volume=TestVolume003 volretention=10s -update Volume=TestVolume003 maxvoljobs=1 -list volumes -run job=$JobName storage=File1 level=full yes -wait -messages -list volumes -run job=$JobName storage=File1 level=full yes -wait -messages -list volumes -run job=$JobName storage=File1 level=full yes -wait -messages -list volumes -@sleep 10 -run job=$JobName storage=File1 level=full yes -wait -messages -list volumes -run job=$JobName storage=File1 level=full yes -wait -messages -list volumes -run job=$JobName storage=File1 level=full yes -wait -messages -list volumes -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File1 -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File1 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/relabel-tape b/regress/tests/relabel-tape deleted file mode 100755 index 2a1ce858c7..0000000000 --- a/regress/tests/relabel-tape +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then finally restore. -# It should require at least 4 different bsrs. -# -TestName="relabel-tape" -JobName=Relabeltape -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName level=Full yes -wait -messages -add pool=Default -0 -TestVolume002 -@# set status to append -update volume=TestVolume001 -1 -. -run job=NightlySave level=Full yes -@sleep 20 -unmount -unmount -purge volume=TestVolume001 -relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default -list volumes -mount -messages -wait -run job=$JobName level=Full yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 - - -echo "Backup done" -# -# now do several restores to ensure we cleanup between jobs -# -cat <tmp/bconcmds -@$out /dev/null -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -@$out tmp/log2.out -@# -@# now unmount the tape and start two restores -@# at the same time -@# -unmount storage=DDS-4 -restore where=${cwd}/tmp/bacula-restores select all done -yes -restore where=${cwd}/tmp/bacula-restores select -unmark * -mark * -done -yes -mount storage=DDS-4 -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole - -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape deleted file mode 100755 index 98827959f5..0000000000 --- a/regress/tests/restore-by-file-tape +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape where the maximum tape file size is set to 1M -# then restore a few files from it. Note, by setting the maximum -# file size to 1M, it runs very slow. There are about 64 files that -# are created during each of the two backups. -# -TestName="restore-by-file-tape" -JobName=restorebyfile -. scripts/functions -set_debug 0 -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list -sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName level=Full yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 file=<${cwd}/tmp/restore2-list -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -dstat=0 -# -# We need to stop and start Bacula to -# test appending to a previously written tape -# -for i in `cat ${cwd}/tmp/restore2-list`; do - diff $i ${cwd}/tmp/bacula-restores$i - if [ $? != 0 ] ; then - dstat=1 - fi -done - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Full yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores -7 -<${cwd}/tmp/restore2-list - -yes -wait -messages -@output -quit -END_OF_DATA - -# -# Bacula was stopped, but we must restart it to -# test appending to a previously written tape -# -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs - -scripts/check_for_zombie_jobs storage=DDS-4 -bin/bacula stop 2>&1 >/dev/null -for i in `cat ${cwd}/tmp/restore2-list`; do - diff $i ${cwd}/tmp/bacula-restores$i - if [ $? != 0 ] ; then - dstat=1 - fi -done - -end_test diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test deleted file mode 100755 index 16078fe638..0000000000 --- a/regress/tests/restore-by-file-test +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then restore it. -# - -TestName="restore-by-file-test" -JobName=restorebyfile -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list -mkdir ${cwd}/tmp/build -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp/build -ls >../1 -cd .. -sed s%\^%${cwd}/tmp/build/% 1 >restore-list -rm -f 1 -cd ${cwd} - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=File -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -check_restore_tmp_build_diff -end_test diff --git a/regress/tests/restore-disk-seek-test b/regress/tests/restore-disk-seek-test deleted file mode 100755 index 72183a659a..0000000000 --- a/regress/tests/restore-disk-seek-test +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# -# Run a backup of the full bacula build directory, but with the -# Maximum File Size set. Then do a restore of a few files to kick in -# disk seeking (not yet enabled), and ensure that the restored files -# match. Even though disk seeking is not yet enabled, this is a good test, -# and once it is enabled, this will test it. -# -TestName="restore-disk-seek-test" -JobName=restore-disk-seek -. scripts/functions -set_debug 0 - -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/tmp/build" >/tmp/file-list -rm -rf ${cwd}/tmp/build -mkdir ${cwd}/tmp/build -# Copy only the .c files (to be restored) -# set files to "*.c" for all c files -files="ua_tree.c ua_update.c" -# files="*.c" -for i in ${files}; do - cp -p ${cwd}/build/src/dird/${i} ${cwd}/tmp/build -done -cd ${cwd}/tmp/build -ls >../1 -cd .. -sed s%\^%${cwd}/tmp/build/% 1 >restore-list -# -# At this point restore-list contains the list -# of files we will restore -# -rm -f 1 -cd ${cwd} -# -# Now arrange to backup *everything* -# -rm -rf ${cwd}/tmp/build -mkdir ${cwd}/tmp/build -cp -fp ${cwd}/build/src/dird/* ${cwd}/tmp/build -# -# Enable MaximumFileSize to ensure lots of JobMedia records and thus -# lots of seeking -# -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -setdebug level=30 fd -setdebug level=11 storage=File -sql -@# print the JobMedia records -select * from JobMedia; - -restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores storage=File -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -# Now setup a control directory of only what we *should* restore -rm -rf ${cwd}/tmp/build -mkdir ${cwd}/tmp/build -for i in ${files}; do - cp -p ${cwd}/build/src/dird/${i} ${cwd}/tmp/build -done - -check_two_logs -check_restore_tmp_build_diff -end_test diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape deleted file mode 100755 index fe3fe3c42b..0000000000 --- a/regress/tests/restore-seek-tape +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape where the maximum tape file size is set to 1M -# then restore a few files from it. Note, by setting the maximum -# file size to 1M, it runs very slow. This tests the -# seeking capability -# -TestName="restore-seek-tape" -JobName=restore-tape-seek -. scripts/functions -set_debug 0 - -copy_tape_confs -echo "${cwd}/tmp/build" >/tmp/file-list -rm -rf ${cwd}/tmp/build -mkdir ${cwd}/tmp/build -# Copy only the .c files (to be restored) -# set files to "*.c" for all c files -files="ua_tree.c ua_update.c" -# files="*.c" -for i in ${files}; do - cp -p ${cwd}/build/src/dird/${i} ${cwd}/tmp/build -done -cd ${cwd}/tmp/build -ls >../1 -cd .. -sed s%\^%${cwd}/tmp/build/% 1 >restore-list -# -# At this point restore-list contains the list -# of files we will restore -# -rm -f 1 -cd ${cwd} -# -# Now arrange to backup *everything* -# -rm -rf ${cwd}/tmp/build -mkdir ${cwd}/tmp/build -cp -fp ${cwd}/build/src/dird/* ${cwd}/tmp/build -# -# Enable MaximumFileSize to ensure lots of JobMedia records and thus -# lots of seeking -# -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size = 1000000% Maximum File Size = 10KB%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 pool=Default -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -setdebug level=30 fd -setdebug level=10 storage=DDS-4 -sql -@# print the JobMedia records -select * from JobMedia; - -restore bootstrap=${cwd}/tmp/kern.bsr where=${cwd}/tmp/bacula-restores storage=DDS-4 -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -# Now setup a control directory of only what we *should* restore -rm -rf ${cwd}/tmp/build -mkdir ${cwd}/tmp/build -for i in ${files}; do - cp -p ${cwd}/build/src/dird/${i} ${cwd}/tmp/build -done - -check_two_logs -check_restore_tmp_build_diff -end_test diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test deleted file mode 100755 index 77b4e375a5..0000000000 --- a/regress/tests/restore2-by-file-test +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then restore a few selected files. -# -TestName="restore2-by-file-test" -JobName=restore2byfile -. scripts/functions -set_debug 0 -copy_test_confs - -echo "${cwd}/build" >/tmp/file-list -sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list - -change_jobname CompressedTest $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore2-list -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -dstat=0 -for i in `cat ${cwd}/tmp/restore2-list`; do - diff $i ${cwd}/tmp/bacula-restores$i - if [ $? != 0 ] ; then - dstat=1 - fi -done -end_test diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test deleted file mode 100755 index 77212621fc..0000000000 --- a/regress/tests/runscript-test +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -# Test if Bacula can automatically create a Volume label. -# - -TestName="runscript-test" - -. scripts/functions -set_debug 0 -copy_test_confs - -rm -f bin/bacula-dir.conf -/bin/cp -f scripts/bacula-dir.conf.testrunscript bin/bacula-dir.conf - -echo "${cwd}/build" >/tmp/file-list - -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -label volume=TestVolume001 -@#setdebug level=100 storage=File -@output tmp/log.RUN2.out -run job=RUN_FD_WARNING yes -wait -@sleep 5 -messages -run job=RUN_ALL_OK yes -wait -@sleep 5 -messages -run job=RUN_FD_FAILED yes -wait -@sleep 5 -messages -run job=RUN_DIR_FAILED yes -wait -@sleep 5 -messages -st dir -quit -END_OF_DATA - - -bin/bacula start -cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf &> tmp/log.RUN1.out - -stop_bacula - -if grep -q 'dir: BeforeJob: run command "/bin/echo RunBeforeJob"' tmp/log.RUN1.out && - grep -q 'fd: ClientRunBeforeJob: ClientRunBeforeJob' tmp/log.RUN1.out && - grep -q 'fd: ClientAfterJob: run command "/bin/echo ClientRunAfterJob' tmp/log.RUN1.out && - grep -q 'dir: AfterJob: run command "/bin/echo RunAfterJob' tmp/log.RUN1.out -then - [ "$debug" -eq 1 ] && echo RUN_ALL_OK ok -else - echo "RUN_ALL_OK in error" - rstat=1 -fi - -if grep -q 'dir: BeforeJob: run command "/bin/false RUN_DIR_FAILED"' tmp/log.RUN1.out && - grep -q 'dir: BeforeJob: RunAfterFailedJob' tmp/log.RUN1.out && - true # grep -q 'Backup OK -- with warnings' tmp/log.RUN1.out -then - [ "$debug" -eq 1 ] && echo RUN_DIR_FAILED ok -else - echo "RUN_DIR_FAILED in error" - rstat=1 -fi - -if grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"' tmp/log.RUN1.out && - grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' tmp/log.RUN1.out && - grep -q 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' tmp/log.RUN1.out -then - [ "$debug" -eq 1 ] && echo RUN_FD_FAILED ok -else - echo "RUN_FD_FAILED in error" - rstat=1 -fi - -if grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_WARNING"' tmp/log.RUN1.out && - grep -q 'Backup OK -- with warnings' tmp/log.RUN1.out -then - [ "$debug" -eq 1 ] && echo RUN_FD_WARNING ok -else - echo "RUN_FD_WARNING in error" - rstat=1 -fi - diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test deleted file mode 100755 index f8fb24f88b..0000000000 --- a/regress/tests/scratch-pool-test +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to two tapes where the maximum tape file size is set to 1M -# Note, this test simulates the tape filling and writing to -# the next tape. One minor wrinkle: we create the two tapes -# in the Scratch pool, so they should be switched to the Default -# Pool automatically. -# We set TestVolume001 to not in the changer, so the algorithm -# should find TestVolume002 and use it rather than blocking. -# -# Note we use the viritual disk autochanger -# -TestName="scratch-pool-test" -JobName=scratch-pool -. scripts/functions -set_debug 0 - -. config.out -if test x${AUTOCHANGER} = x/dev/null ; then - echo "two-volume-test skipped. No autochanger." - exit -fi -cwd=`pwd` -scripts/cleanup -scripts/copy-2disk-confs -scripts/prepare-two-disks - -echo "${cwd}/build" >/tmp/file-list - -outf="tmp/sed_tmp" -echo "s%# Maximum File Size% Maximum File Size%g" >${outf} -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -# Write out bconsole commands -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Scratch drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Scratch drive=0 -update Volume=TestVolume001 MaxVolBytes=2000000 pool=Scratch drive=0 -update Volume=TestVolume001 inchanger=no pool=Scratch drive=0 -@#setdebug level=200 storage=DDS-4 -llist volume=TestVolume001 -llist volume=TestVolume002 -run job=$JobName yes -wait -messages -list volumes -llist volume=TestVolume001 -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test deleted file mode 100755 index 6969c3c7cc..0000000000 --- a/regress/tests/six-vol-test +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Create a 60MB file with random bytes. Back it up to 6 Volumes -# each constrained to 10MB using the automatic labeling feature. -# -TestName="six-vol-test" -JobName=SixVol -. scripts/functions -set_debug 0 - -if test ! -c /dev/urandom ; then - echo "No random device. Test skipped.\n" - exit 0 -fi - -scripts/cleanup -scripts/copy-testa-confs -echo "${cwd}/tmp/largefile" >/tmp/file-list -# Create 56MB file with random data -echo "Creating a 56MB file with random data ..." -dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000 -echo "largefile created" - -change_jobname MultiVol $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run job=$JobName storage=File yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -diff tmp/largefile tmp/bacula-restores${cwd}/tmp/largefile 2>&1 >/dev/null -dstat=$? -end_test diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape deleted file mode 100755 index 9c68cad1eb..0000000000 --- a/regress/tests/small-file-size-tape +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape where the maximum tape file size is set to 1M -# -TestName="small-file-size-tape" -JobName=smallfilesize -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -setdebug level=2 storage=DDS-4 -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test deleted file mode 100755 index c5ec639540..0000000000 --- a/regress/tests/span-vol-test +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory but -# split the archive into four volumes, two of which are -# totally full. I.e. make sure that bsr selects all tapes -# including those fully spanned. -# -TestName="span-vol-test" -JobName=SpanVol -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=File1 volume=TestVolume004 -label storage=File1 volume=TestVolume003 -label storage=File1 volume=TestVolume002 -label storage=File1 volume=TestVolume001 -update Volume=TestVolume004 MaxVolBytes=3000000 -update Volume=TestVolume003 MaxVolBytes=3000000 -update Volume=TestVolume002 MaxVolBytes=3000000 -run job=$JobName storage=File1 yes -wait -list volumes -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File1 -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File1 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test deleted file mode 100755 index bcbb6bfc4d..0000000000 --- a/regress/tests/sparse-compressed-test +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the Sparse option -# then restore it. -# -TestName="sparse-compressed-test" -JobName=Sparse-conpressed -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -start_test - -cat >tmp/bconcmds </tmp/file-list -cd ${cwd}/build/src/tools -./gigaslam -if [ $? != 0 ]; then - echo "Execute of ${cwd}/build/src/tools/gigaslam failed." - rm -f ${cwd}/build/src/tools/gigaslam.gif - exit 1 -fi -cd ${cwd} - -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -setdebug level=10 fd -run job=$JobName yes -wait -messages -list volumes -@# -@# now do a restore -@# -@$out tmp/log2.out -@# setdebug level=0 fd -restore where=${cwd}/tmp/bacula-restores storage=File -5 -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -sleep 2 -check_for_zombie_jobs storage=File -stop_bacula - -size=`du ${cwd}/tmp/bacula-restores/${cwd}/build/src/tools/gigaslam.gif | cut -f 1` -if [ $size -gt 120 ]; then - echo "========== restored sparse file: gigaslam.gif too big =========" - echo " size is ${size}K it should be 120K" -fi - -check_two_logs -check_restore_diff -end_test -rm -f ${cwd}/build/src/tools/gigaslam.gif -rm -r ${cwd}/build/gigaslam.gif diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test deleted file mode 100755 index 9ff464af29..0000000000 --- a/regress/tests/sparse-test +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the Sparse option -# then restore it. -# -TestName="sparse-test" -JobName=SparseTest -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -start_test - -cat >tmp/bconcmds <test.out -rm -f bin/working/* diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape deleted file mode 100755 index acfda15f3e..0000000000 --- a/regress/tests/truncate-bug-tape +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -# -# Test for a tape truncation bug. -# -TestName="truncate-bug-tape" -JobName=truncatebug -. scripts/functions - -set_debug 0 -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -@# do a bunch of saves so we have 12 files on the tape -run job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -@#setdebug level=100 storage=DDS-4 -wait -messages -quit -END_OF_DATA - -run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log2.out -@# -@# now do a restore -@# -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 -3 -@# select JobId=4 (i.e. file five on the tape) -4 -cd ${cwd}/build -@# mark a single file -mark configure -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bconsole -scripts/check_for_zombie_jobs storage=DDS-4 - -# Now write to tape one more time -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log3.out -run level=Full job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -grep "^ Termination: *Backup OK" tmp/log3.out 2>&1 >/dev/null -dstat=$? -end_test diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test deleted file mode 100755 index 9c20ca02c0..0000000000 --- a/regress/tests/two-jobs-test +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup a second time and finally restore it -# -TestName="two-jobs-test" -JobName=Two-Jobs -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname CompressedTest $JobName -start_test - -cat >tmp/bconcmds <tmp/bconcmds </tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list - -start_test - -# Write out bconsole commands to a file -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -list volumes -@# Start job with Client run before and sleep -run job=NightlySave1 level=Full pool=Default yes -run job=NightlySave1 level=Full pool=Default yes -run job=NightlySave1 level=Full pool=Default yes -@# wait between starting jobs -@sleep 60 -@#setdebug level=100 storage=DDS-4 -run job=NightlySave2 level=Full pool=Full yes -run job=NightlySave2 level=Full pool=Full yes -run job=NightlySave2 level=Full pool=Full yes -@sleep 10 -messages -@sleep 10 -messages -@sleep 10 -status storage=DDS-4 -messages -wait -list volumes -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test deleted file mode 100755 index 4cd29d8a34..0000000000 --- a/regress/tests/two-pool-test +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# -# This is Arno's test. It uses two pools, two tapes, and -# an autochanger. Note, the Director has three Pools in its -# conf: Default, Full, and Inc. Default is used in the -# NightlySave job by default. What is backed up is what -# is in /tmp/file-list, which is by default the Bacula -# source code (i.e. the build directory). -# -# Note, we use the virtual disk autochanger. -# -TestName="two-pool-test" -JobName=Two-pool -. scripts/functions -set_debug 0 - -. config.out -cwd=`pwd` -scripts/cleanup -scripts/copy-2disk-confs -scripts/prepare-two-disks - -# Make a relatively large backup set 5 x source code directory -# Reduced to 1 for portable -echo "${cwd}/build" >/tmp/file-list - -start_test - -# Write out bconsole commands to a file -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -list volumes -@# Start job with Client run before and sleep -run job=NightlySave1 level=Full pool=Default yes -run job=NightlySave1 level=Full pool=Default yes -run job=NightlySave1 level=Full pool=Default yes -@# wait between starting jobs -@sleep 60 -@#setdebug level=100 storage=DDS-4 -run job=NightlySave2 level=Full pool=Full yes -run job=NightlySave2 level=Full pool=Full yes -run job=NightlySave2 level=Full pool=Full yes -@sleep 10 -messages -@sleep 10 -messages -@sleep 10 -status storage=DDS-4 -messages -wait -list volumes -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test deleted file mode 100755 index a7ad2d591e..0000000000 --- a/regress/tests/two-vol-test +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory but -# split the archive into two volumes -# -TestName="two-vol-test" -JobName=TwoVol -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File1 volume=TestVolume002 -label storage=File1 volume=TestVolume001 -update Volume=TestVolume002 MaxVolBytes=3000000 -run job=$JobName storage=File1 yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=File1 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File1 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape deleted file mode 100755 index b26e0a9d85..0000000000 --- a/regress/tests/two-volume-tape +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to two tapes where the maximum tape file size is set to 1M -# Note, this test simulates the tape filling and writing to -# the next tape. -# -TestName="two-volume-tape" -JobName=twovoltape -. scripts/functions -set_debug 0 - - -. config.out -if test x${AUTOCHANGER} = x/dev/null ; then - echo "two-volume-tape test skipped. No autochanger." - exit -fi - -scripts/cleanup -scripts/copy-2tape-confs -scripts/prepare-two-tapes - -echo "${cwd}/build" >/tmp/file-list - -outf="tmp/sed_tmp" -echo "s%# Maximum File Size% Maximum File Size%g" >${outf} -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname $JobName -start_test - -# Write out bconsole commands -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=0 -@#setdebug level=1000 client -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -mt -f ${TAPE_DRIVE} rewind -mtx -f ${AUTOCHANGER} unload -sleep 15 - -cat <tmp/bconcmds -@$out /dev/null -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test deleted file mode 100755 index 7c2c51ad67..0000000000 --- a/regress/tests/two-volume-test +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to two tapes where the maximum tape file size is set to 1M -# Note, this test simulates the tape filling and writing to -# the next tape. -# -# Note we use the viritual disk autochanger -# -TestName="two-volume-test" -JobName=TwoVolume -. scripts/functions -set_debug 0 -. config.out - -cwd=`pwd` -scripts/cleanup -scripts/copy-2disk-confs -scripts/prepare-two-disks - -echo "${cwd}/build" >/tmp/file-list - -outf="tmp/sed_tmp" -echo "s%# Maximum File Size% Maximum File Size%g" >${outf} -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -# Write out bconsole commands -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=0 -@#setdebug level=1000 client -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root deleted file mode 100755 index 0f5002d928..0000000000 --- a/regress/tests/usr-tape-root +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the /usr directory -# then restore it. -# -cwd=`pwd` -scripts/copy-tape-confs -scripts/cleanup-tape -echo "/usr" >/tmp/file-list - -echo " " -echo " " -echo " === Starting usr-tape-root test ===" -echo " " -echo " " - -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/original -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/restored -cd ${cwd}/tmp -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% original >1 -sort <1 >original -# -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% restored >1 -sort <1 >restored -rm -f 1 -# -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/nul -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== !!!! usr-tape-root failed !!!! ===== " - echo " ===== !!!! usr-tape-root failed !!!! ===== " >>test.out - echo " " -else - echo " ===== usr-tape-root OK ===== " - echo " ===== usr-tape-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/tests/verify-vol-tape b/regress/tests/verify-vol-tape deleted file mode 100755 index c544bc6603..0000000000 --- a/regress/tests/verify-vol-tape +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then verify the catalog. -# -TestName="verify-vol-tape" -JobName=VerifyVol -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -setdebug level=1 storage=DDS-4 sd -label storage=DDS-4 volume=TestVolume001 pool=Default -run job=$JobName yes -wait -messages -@# -@# now do a verify volume -@# -@$out ${cwd}/tmp/original -run job=VerifyTape pool=Default -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula - -sleep 2 -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null -bstat=$? -grep "^ Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null -rstat=$? -dstat=0 -end_test diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test deleted file mode 100755 index af899b4de0..0000000000 --- a/regress/tests/verify-vol-test +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then verify the catalog. -# -TestName="verify-vol-test" -JobName=VerifyVol -. scripts/functions -set_debug 0 - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -setdebug level=1 storage=File sd -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -@# -@# now do a verify volume -@# -@$out ${cwd}/tmp/original -run job=VerifyVolume -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula - -sleep 2 -check_for_zombie_jobs storage=File -stop_bacula - -grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null -bstat=$? -grep "^ Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null -rstat=$? -dstat=0 -end_test diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test deleted file mode 100755 index 96fed89322..0000000000 --- a/regress/tests/weird-files-test +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -TestName="weird-files-test" -JobName=wierd-files -. scripts/functions -set_debug 0 - -if test ! -d weird-files ; then - echo " " - echo "Weird files not configured. Test not run." - exit 0 -fi - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -change_jobname NightlySave $JobName -# -# Note, we save the weird-files directory twice on purpose -# because this causes problems with hard linked files -# that are only saved once. In 1.33, Bacula now deals -# with this situation. -# -echo "${cwd}/weird-files" >/tmp/file-list -echo "${cwd}/weird-files" >>/tmp/file-list - -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File -TestVolume001 -run job=$JobName -yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -${cwd}/bin/testls weird-files | sort >${cwd}/tmp/original -cd tmp/bacula-restores${cwd} -${cwd}/bin/testls weird-files | sort >${cwd}/tmp/restored -cd ${cwd} - -check_two_logs -diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null -dstat=$? -end_test diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test deleted file mode 100755 index ec328155dd..0000000000 --- a/regress/tests/weird-files2-test +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -TestName="weird-files2-test" -JobName=weird-files2 -. scripts/functions -set_debug 0 - -if test ! -d weird-files ; then - echo " " - echo "weird files not configured. Test not run." - exit 0 -fi -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -rm -rf weird-files2 -cp -Rp weird-files weird-files2 -echo "${cwd}/weird-files2" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -bin/testls weird-files2 >${cwd}/tmp/original - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -# -# Now mess up the a hard link, and a soft link -# -cd weird-files2 -rm -f hard-file2 -ln hard-file3 hard-file2 -rm -f soft-file2 -ln -s soft-file3 soft-file2 -cd ${cwd} -cat <tmp/bconcmds -@$out /dev/null -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where= storage=File -5 -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=File -stop_bacula - -bin/testls weird-files2 >${cwd}/tmp/restored - -check_two_logs -diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null -dstat=$? - -end_test diff --git a/regress/tests/win32-backup-tape b/regress/tests/win32-backup-tape deleted file mode 100755 index 3322da8d49..0000000000 --- a/regress/tests/win32-backup-tape +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# -TestName="win32-backup-tape" -JobName=win32tape -. scripts/functions -set_debug 0 - -scripts/copy-win32-confs -scripts/cleanup-tape - -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 -run job=$JobName yes -@sleep 10 -status storage=DDS-4 -@sleep 30 -messages -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=c:/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -# no diff for now -dstat=0 -end_test diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape deleted file mode 100755 index 5640e9f9ec..0000000000 --- a/regress/tests/win32-to-linux-tape +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# -TestName="win32-to-linux-tape" -JobName=AutoLabel -. scripts/functions -set_debug 0 - -scripts/copy-win32-confs -scripts/cleanup-tape - -echo "${cwd}/build" >/tmp/file-list - -change_job $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 -run job=NightlySave yes -@sleep 10 -status storage=DDS-4 -@sleep 30 -messages -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=/tmp/bacula-restores client=Tibs select all storage=DDS-4 done -yes -wait -messages -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -# No diff for the moment -dstat=0 -end_test diff --git a/regress/weird-files.tar.gz b/regress/weird-files.tar.gz deleted file mode 100644 index 78f715816ed797a3eeb5f9dd86c5fd192cf86bab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1711 zcmZ`&`#)591D??m#%IQ-FuH8>$)!Qo<>Q_>td+wi;nVvl&*=eOsF=ZEJ;%TgrNrYL_$*tNvsMF}m{ zGM>HlD)~$6K)0NO?>j%UQFq%%ZdBG8>XgGC!$`yX`bxcXeo2Y{JF-+L=~Yf?JTXB1 zNl8h_-)bz;a+T|5gZ~pFyL=xt7rf7k@qfiHq2F~<@(j}z32$h6XesVZ^H`X!J{M{4 zP{!Hyq{-knBh~%BkF{<}qTRRI`aTxe((!NZ!3*!{xQKn4)$hV{z)S^ z?t)g~3yNb}!q6DT>A%u>{=yv|`g>BkZHV@!U+p}abM(;kRi>AzL#X-i!=Mi=tNn`u zA*C+qkJPISUB-!`gVkI2QexlZoJA>X=`6j)X1USW`UntZfqR*0WYuiGO)4(*@~!V1 zZI&c!{uzY!7f8Y0{F9oXcZQ6u@4XA$WZLgxswr^|8UxPQPLMS!s)1RsyRnR3{V-edgE=%6-+*(dUjt*VdTX zm%44Cv=uI1y9kX>4DL(Lu)T*Bzr`SRrk(&?pA6{d64yk%aN!vvj?DVmR104d?BmL~ z=a?DW+_Y{?qGOu zq$dZYA0RlOIgYuw_3O{#X-Y^Xw7SlHK=%L#(iJdJi`{ z0c@~xq4Xi|;n%H^6}bIYz?g_$mYISYlVh>%VAV)st4uL$!)f-!{wtL1u z11jDyn7C=p;&4((ISW4ww3(^@Q1;rG^HEHm2wW=aA!%)P9O8pPA3$WyqR6Ks>?o$r zS=+r+a|BMwi48txM7%!6FyL^@ibi$rf#)SVegBTa3s-S0moUU%mg3(k<`JC=%Nr)V z6$>qw@T%eAOPX^XR44nMIp^9%C-v=Z(^&;Tu3<6jARoJs_3B0q0 zdgQ_rTj_<$@j+9c$fv&=naZafLNFCSZ$^yB#%UT&7WGN2xPAp!@S!w2;arO5h_<+V zl^@Sp4c%xLT7cLV8+_{Go_TaJfasd;rXYzu+uzim4YH2IPX`-8!J~`G!Zg$zbTM*UEZB<`}AEZcY?{CV#ZUQ!YR7D{`|V=Vqf&jBIJuw zm3n~Y@$^kv@m7>7Q11bH4rqA1`6dgpAi*Yh#g&{W&0#k%Bl~e4+!}&aK`CxVhUyzn zn~#6r?cS1Gu?&3H*SWcw1EHA$P!BG^zVLa_il+#q0{A!JyYr#$FcEFaITz%bfYaw6 zsGdTR@FTTyz@@ZuzPoy3tKS|TW_7H?HEhfM+h7KMm7vwe!|IUm1l&h$`6lkP4iPVh zHSjtc2CDv$Wrj7sVIT-4Z&OB-h@e=^^K4i%pZz8Tqo*Pwy-$DTAi?E%cxV$&eY>;Y vI23Z~+~u&}edXhS;`x1%NOYcRnul 2>&1 -COPY test.out test1.out -CALL tests\test0 -CALL tests\backup-bacula-tape -CALL tests\btape-fill-tape -CALL tests\fixed-block-size-tape -CALL tests\four-concurrent-jobs-tape -CALL tests\four-jobs-tape -CALL tests\incremental-tape -CALL tests\relabel-tape -CALL tests\restore-by-file-tape -CALL tests\small-file-size-tape -CALL tests\truncate-bug-tape -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 diff --git a/regress/win32/all-non-root-tests.cmd b/regress/win32/all-non-root-tests.cmd deleted file mode 100644 index faeb4699ae..0000000000 --- a/regress/win32/all-non-root-tests.cmd +++ /dev/null @@ -1,48 +0,0 @@ -REM -REM Run all tests -REM -DEL test1.out -CALL tests\test0 -ECHO. -CALL tests\auto-label-test -CALL tests\backup-bacula-test -CALL tests\bextract-test -CALL tests\bscan-test -CALL tests\bsr-opt-test -CALL tests\compressed-test -CALL tests\concurrent-jobs-test -CALL tests\data-encrypt-test -CALL tests\differential-test -CALL tests\four-concurrent-jobs-test -CALL tests\four-jobs-test -CALL tests\incremental-test -CALL tests\query-test -CALL tests\recycle-test -CALL tests\restore2-by-file-test -CALL tests\restore-by-file-test -CALL tests\restore-disk-seek-test -CALL tests\six-vol-test -CALL tests\span-vol-test -CALL tests\sparse-compressed-test -CALL tests\sparse-test -CALL tests\two-jobs-test -CALL tests\two-vol-test -CALL tests\verify-vol-test -REM CALL tests\weird-files2-test -REM CALL tests\weird-files-test -CALL tests\migration-job-test -CALL tests\migration-jobspan-test -CALL tests\migration-volume-test -CALL tests\migration-time-test -REM CALL tests\hardlink-test -REM -REM The following are Virtual Disk Autochanger tests -CALL tests\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 diff --git a/regress/win32/all-root-tests.cmd b/regress/win32/all-root-tests.cmd deleted file mode 100644 index 20061b1768..0000000000 --- a/regress/win32/all-root-tests.cmd +++ /dev/null @@ -1,10 +0,0 @@ -REM -REM Run all root tests -REM -DEL 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 diff --git a/regress/win32/all-tape-and-file-tests.cmd b/regress/win32/all-tape-and-file-tests.cmd deleted file mode 100644 index cbbebf2c2d..0000000000 --- a/regress/win32/all-tape-and-file-tests.cmd +++ /dev/null @@ -1,5 +0,0 @@ -REM -REM Run all tests -REM -CALL all-non-root-tests -CALL all-non-root-tape-tests diff --git a/regress/win32/all-tests.cmd b/regress/win32/all-tests.cmd deleted file mode 100644 index 62ffa6e940..0000000000 --- a/regress/win32/all-tests.cmd +++ /dev/null @@ -1,7 +0,0 @@ -REM -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/config.cmd b/regress/win32/config.cmd deleted file mode 100644 index 95a4113b1d..0000000000 --- a/regress/win32/config.cmd +++ /dev/null @@ -1,10 +0,0 @@ -@ECHO off -REM -REM First argument is expected to be a user's configuration file -REM -IF "%1" == "" ( - ECHO Arg1 must specify a config file ^(e.g. prototype.conf^) - EXIT /b 1 -) - -COPY %1 config_var.cmd diff --git a/regress/win32/make.cmd b/regress/win32/make.cmd deleted file mode 100644 index eaf74b1a4e..0000000000 --- a/regress/win32/make.cmd +++ /dev/null @@ -1,111 +0,0 @@ -@ECHO off -REM -REM Makefile for Bacula regression testing -REM -REM Note, Makefile is built from Makefile.in, which you should not really -REM need to change, by invoking: -REM -REM config -REM -REM e.g. -REM config kern.conf -REM - -SETLOCAL - -IF EXIST config_var.cmd GOTO :already_configured -ECHO You must run config first and supply the name of your conf file. -ECHO Use prototype.conf as a template. -EXIT /B 1 - -:already_configured - -SET PATH=%PATH%;%CD%\bin;%CD%\tools - -REM suck in user's configuration -CALL config_var.cmd - -IF EXIST "%BACULA_SOURCE%\configure" GOTO :source_ok -ECHO Unable to access the Bacula source in %BACULA_SOURCE%. Update -ECHO BACULA_SOURCE in your configuration file and rerun config. -EXIT /B 1 - -:source_ok -IF "%1" == "setup" GOTO :setup -IF "%1" == "bacula" GOTO :bacula -IF "%1" == "sed" GOTO :sed -IF "%1" == "test" GOTO :test -IF "%1" == "full_test" GOTO :full_test -IF "%1" == "root_test" GOTO :root_test -IF "%1" == "clean" GOTO :clean -IF "%1" == "reset" GOTO :reset -IF "%1" == "distclean" GOTO :distclean - -IF EXIST "%1" ( - %1 -) ELSE IF EXIST "%1.cmd" ( - %1 -) ELSE IF EXIST tests\%1 ( - tests\%1 -) ELSE IF EXIST tests\%1.cmd ( - tests\%1 -) ELSE ( - ECHO Unsupported option: %1 - ECHO Valid options are: - ECHO setup, bacula, sed, test, full_test, root_test, clean, reset, distclean - EXIT /b 1 -) - -:setup -CALL :bacula %2 -CALL :sed -GOTO :EOF - -:bacula -RD /s /q build bin weird-files tmp working 2>nul -MKDIR tmp working -SET BUILD_TYPE=%1 -IF "%BUILD_TYPE%"=="" SET BUILD_TYPE=release -ECHO Doing: scripts\setup "%BACULA_SOURCE%" %BUILD_TYPE% %EMAIL% %SMTP_HOST% %TAPE_DRIVE% %AUTOCHANGER% %AUTOCHANGER_PATH% %TAPE_DRIVE1% -CALL scripts\setup "%BACULA_SOURCE%" %BUILD_TYPE% %EMAIL% %SMTP_HOST% %TAPE_DRIVE% %AUTOCHANGER% %AUTOCHANGER_PATH% %TAPE_DRIVE1% -GOTO :EOF - -:sed -ECHO Doing: scripts\do_sed %EMAIL% %SMTP_HOST% %TAPE_DRIVE% %AUTOCHANGER% %AUTOCHANGER_PATH% %TAPE_DRIVE1% -CALL scripts\do_sed %EMAIL% %SMTP_HOST% %TAPE_DRIVE% %AUTOCHANGER% %AUTOCHANGER_PATH% %TAPE_DRIVE1% -GOTO :EOF - -:test -REM Run all non-root userid tests -CALL all-non-root-tests -GOTO :EOF - -:full_test -REM run all file and tape tests -CALL all-tape-and-file-tests -GOTO :EOF - -:root_test -REM These tests require you to run as root -CALL all-root-tests -GOTO :EOF - -:clean -CALL scripts\cleanup -DEL \tmp\file-list tmp\* working\* test.out diff >nul 2>&1 -DEL 1 2 3 scripts\1 scripts\2 scripts\3 tests\1 tests\2 tests\3 >nul 2>&1 -DEL .#* /s >nul 2>&1 -GOTO :EOF - -:reset -REM Reset our userid after running as root -CALL scripts\cleanup -DEL \tmp\file-list tmp\file-list -DEL tmp\* working\* -GOTO :EOF - -:distclean -RD /s /q bin build weird-files weird-files weird-files2 tmp working 2>nul -DEL scripts\*.conf -CALL :clean -GOTO :EOF diff --git a/regress/win32/prototype.conf b/regress/win32/prototype.conf deleted file mode 100644 index e6658feeda..0000000000 --- a/regress/win32/prototype.conf +++ /dev/null @@ -1,31 +0,0 @@ -REM -REM Prototype personal configuration file for the regression -REM scripts. Either edit this file directly, or better copy -REM it elsewhere so it won't get overwritten. -REM - -REM -REM Put the full path to the Bacula source code to be tested -REM -SET BACULA_SOURCE= - -REM Where to send email messages -REM -SET EMAIL= -SET SMTP_HOST=localhost - -REM -REM The device name of your tape drive if you have one -REM -SET TAPE_DRIVE=tape0 -SET TAPE_DRIVE1=nul - -REM -REM if you don't have an autochanger set AUTOCHANGER to nul -REM -SET AUTOCHANGER=changer0 - -REM -REM This must be the path to the autochanger including its name -REM -SET AUTOCHANGER_PATH=%CD%\bin\mtx diff --git a/regress/win32/scripts/bacula-dir-migration.conf.in b/regress/win32/scripts/bacula-dir-migration.conf.in deleted file mode 100644 index 312feb5205..0000000000 --- a/regress/win32/scripts/bacula-dir-migration.conf.in +++ /dev/null @@ -1,229 +0,0 @@ -# -# Default Bacula Director Configuration file -# -# The only thing that MUST be changed is to add one or more -# file or directory names in the Include directive of the -# FileSet resource. -# -# For Bacula release 1.39 -# -# You might also want to change the default email address -# from root to your address. See the "mail" and "operator" -# directives in the Messages resource. -# - -Director { # define myself - Name = @hostname@-dir - DIRport = 8101 # where we listen for UA connections - QueryFile = "@scriptdir@/query.sql" - WorkingDirectory = "@working_dir@" - PidDirectory = "@piddir@" - Maximum Concurrent Jobs = 4 - Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" - Messages = Daemon -} - -# -# Define the main nightly save backup job -# By default, this job will back up to disk in /tmp -Job { - Name = "NightlySave" - Type = Backup - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" - Maximum Concurrent Jobs = 4 - SpoolData = yes -# Prefer Mounted Volumes = no -} - -Job { - Name = "migrate-job" - Type = Migrate - Level = Full - Client=@hostname@-fd - FileSet="Full Set" - Messages = Standard - Storage = DiskChanger - Write Bootstrap = "@working_dir@/migratejob.bsr" - Pool = Default - Maximum Concurrent Jobs = 4 - Selection Type = Job - Selection Pattern = ".*Save" -} - -Job { - Name = "migrate-volume" - Type = Migrate - Level = Full - Client=@hostname@-fd - FileSet="Full Set" - Messages = Standard - Storage = DiskChanger - Write Bootstrap = "@working_dir@/migratevol.bsr" - Pool = Default - Maximum Concurrent Jobs = 4 - Selection Type = Volume - Selection Pattern = "File*" -} - -Job { - Name = "migrate-occupancy" - Type = Migrate - Level = Full - Client=@hostname@-fd - FileSet="Full Set" - Messages = Standard - Storage = DiskChanger - Write Bootstrap = "@working_dir@/migratejob.bsr" - Pool = Default - Maximum Concurrent Jobs = 4 - Selection Type = PoolOccupancy -} - -Job { - Name = "migrate-time" - Type = Migrate - Level = Full - Client=@hostname@-fd - FileSet="Full Set" - Messages = Standard - Storage = DiskChanger - Write Bootstrap = "@working_dir@/migratejob.bsr" - Pool = Default - Maximum Concurrent Jobs = 4 - Selection Type = PoolTime -} - - - - -# Standard Restore template, to be changed by Console program -Job { - Name = "RestoreFiles" - Type = Restore - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Where = /tmp/bacula-restores -} - - -# List of files to be backed up -FileSet { - Name = "Full Set" - Include { Options { signature=MD5 } - File = tmp\bconcmds -CALL scripts\functions run_bconsole -grep "No Jobs running." tmp\dir.out >nul 2>&1 -IF %ERRORLEVEL% NEQ 0 ( - ECHO. - ECHO !!!! Zombie Jobs in Director !!!! - ECHO !!!! Zombie Jobs in Director !!!! >>test.out - ECHO. -) -grep "No Jobs running." tmp\fd.out >nul 2>&1 -IF %ERRORLEVEL% NEQ 0 ( - ECHO. - ECHO !!!! Zombie Jobs in File daemon !!!! - ECHO !!!! Zombie Jobs in File daemon !!!! >>test.out - ECHO. -) -grep "No Jobs running." tmp\sd.out >nul 2>&1 -IF %ERRORLEVEL% NEQ 0 ( - ECHO. - ECHO !!!! Zombie Jobs in Storage daemon !!!! - ECHO !!!! Zombie Jobs in Storage daemon !!!! >>test.out - ECHO. -) -grep "ERROR" tmp/log*.out >nul 2>&1 -IF %ERRORLEVEL% EQU 0 ( - ECHO. - ECHO !!!! ERROR in log output !!!! - ECHO !!!! ERROR in log output !!!! >>test.out - ECHO. -) -grep "Fatal Error" tmp\log*.out >nul 2>&1 -IF %ERRORLEVEL% EQU 0 ( - ECHO. - ECHO !!!! Fatal Error in log output !!!! - ECHO !!!! Fatal Error in log output !!!! >>test.out - ECHO. -) diff --git a/regress/win32/scripts/cleanup-2drive.cmd.in b/regress/win32/scripts/cleanup-2drive.cmd.in deleted file mode 100644 index c49d6dbacc..0000000000 --- a/regress/win32/scripts/cleanup-2drive.cmd.in +++ /dev/null @@ -1,43 +0,0 @@ -REM -REM Cleanup left over files -- both before and after test run -REM -CALL scripts\cleanup - -IF NOT "@autochanger@" == "nul" ( - SET slot=0 - FOR /f %%i in ( 'bin\mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1' ) DO SET slot=%%i - ECHO Slot %slot% in drive 1 - IF !slot! NEQ 0 ( - ECHO unload slot !slot! in drive 1 - bin\mtx-changer @autochanger@ unload !slot! @tape_drive1@ 1 - ) - FOR /f %%i in ( 'bin\mtx-changer @autochanger@ loaded 0 @tape_drive@ 0' ) DO SET slot=%%i - ECHO Slot !slot! in drive 0 - IF !slot! NEQ 0 ( - echo "unload slot !slot! in drive 0" - bin\mtx-changer @autochanger@ unload !slot! @tape_drive@ 0 - ) - - FOR /f %%i in ( 'bin\mtx-changer @autochanger@ loaded 0 @tape_drive1@ 1' ) DO SET slot=%%i - IF !slot! NEQ 2 ( - ECHO load slot 2 in drive 1 - bin\mtx-changer @autochanger@ load 2 @tape_drive1@ 1 - ) - ECHO WEOF drive 1 - mt -f @tape_drive1@ rewind - mt -f @tape_drive1@ weof - ECHO unload slot 2 in drive 1 - bin\mtx-changer @autochanger@ unload 2 @tape_drive1@ 1 - - FOR /f %%i in ( 'bin\mtx-changer @autochanger@ loaded 0 @tape_drive@ 0' ) DO SET slot=%%i - ECHO Slot !slot! in drive 0 - IF !slot! NEQ 1 ( - ECHO load slot 1 in drive 0 - bin\mtx-changer @autochanger@ load 1 @tape_drive@ 0 - ) - ECHO WEOF drive 0 - mt -f @tape_drive@ rewind - mt -f @tape_drive@ weof - ECHO unload slot 1 from drive 0 - bin\mtx-changer @autochanger@ unload 1 @tape_drive@ 0 -) diff --git a/regress/win32/scripts/cleanup-2tape.cmd.in b/regress/win32/scripts/cleanup-2tape.cmd.in deleted file mode 100644 index a572d7f5a5..0000000000 --- a/regress/win32/scripts/cleanup-2tape.cmd.in +++ /dev/null @@ -1,29 +0,0 @@ -REM -REM Cleanup left over files -- both before and after test run -REM - -setlocal ENABLEDELAYEDEXPANSION - -CALL scripts\cleanup - -IF NOT "@autochanger@" == "nul" ( - SET slot=0 - FOR /f %%i in ( 'bin\mtx-changer @autochanger@ loaded 0 dummy 0' ) DO SET slot=%%i - IF !slot! NEQ 2 ( - bin\mtx-changer @autochanger@ unload 0 @tape_drive@ 0 - bin\mtx-changer @autochanger@ load 2 @tape_drive@ 0 - ) - mt -f @tape_drive@ rewind - mt -f @tape_drive@ weof - - REM - REM If we have an autochanger always load tape in slot 1 - REM - FOR /f %%i in ( 'bin\mtx-changer @autochanger@ loaded 0 dummy 0' ) DO SET slot=%%i - IF !slot! NEQ 1 ( - bin\mtx-changer @autochanger@ unload 0 @tape_drive@ 0 - bin\mtx-changer @autochanger@ load 1 @tape_drive@ 0 - ) -) -mt -f @tape_drive@ rewind -mt -f @tape_drive@ weof diff --git a/regress/win32/scripts/cleanup-tape.cmd.in b/regress/win32/scripts/cleanup-tape.cmd.in deleted file mode 100644 index 46ce41a6d5..0000000000 --- a/regress/win32/scripts/cleanup-tape.cmd.in +++ /dev/null @@ -1,7 +0,0 @@ -REM -REM Cleanup left over files -- both before and after test run -REM -CALL scripts\cleanup - -mt -f @tape_drive@ rewind -mt -f @tape_drive@ weof diff --git a/regress/win32/scripts/cleanup.cmd b/regress/win32/scripts/cleanup.cmd deleted file mode 100644 index 0125175548..0000000000 --- a/regress/win32/scripts/cleanup.cmd +++ /dev/null @@ -1,23 +0,0 @@ -@ECHO off -REM -REM Cleanup left over files -- both before and after test run -REM - -CALL scripts\bacula stop >nul 2>&1 - -DEL /q /f \tmp\FileVolume* tmp\FileVolume* >nul 2>&1 -DEL /q /f \tmp\TestVolume001 \tmp\Small* >nul 2>&1 -RD /s /q \tmp\bacula-restores tmp\bacula-restores >nul 2>&1 -DEL /q /f tmp\original tmp\Small* tmp\TestVolume* >nul 2>&1 -DEL /q /f tmp\restored tmp\largefile tmp\bscan.bsr tmp\log*.out >nul 2>&1 -DEL /q /f \tmp\sed_tmp \tmp\file-list >nul 2>&1 -RD /s /q tmp\build >nul 2>&1 -DEL /q /f tmp\restore-list tmp\restore2-list >nul 2>&1 -DEL /q /f tmp\fd.out tmp\dir.out tmp\sd.out >nul 2>&1 -DEL /q /f working\log tmp\TEST-* >nul 2>&1 -DEL /q /f working\*.bsr >nul 2>&1 -DEL /q /f tmp\disk-changer.cmd \tmp\disk-changer.cmd >nul 2>&1 - -CALL bin\drop_bacula_tables >nul 2>&1 -CALL bin\make_bacula_tables >nul 2>&1 -CALL bin\grant_bacula_privileges >nul 2>&1 diff --git a/regress/win32/scripts/copy-2disk-confs.cmd b/regress/win32/scripts/copy-2disk-confs.cmd deleted file mode 100644 index e759a41413..0000000000 --- a/regress/win32/scripts/copy-2disk-confs.cmd +++ /dev/null @@ -1,9 +0,0 @@ -REM -REM Setup for using the Virtual Disk Changer (simulates tape changer) -REM -COPY scripts\bacula-dir-tape.conf bin\bacula-dir.conf -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 diff --git a/regress/win32/scripts/copy-2disk-drive-confs.cmd b/regress/win32/scripts/copy-2disk-drive-confs.cmd deleted file mode 100644 index 173eec2df0..0000000000 --- a/regress/win32/scripts/copy-2disk-drive-confs.cmd +++ /dev/null @@ -1,6 +0,0 @@ -COPY scripts\bacula-dir-tape.conf bin\bacula-dir.conf -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 diff --git a/regress/win32/scripts/copy-2drive-confs.cmd b/regress/win32/scripts/copy-2drive-confs.cmd deleted file mode 100644 index d20bf19ca9..0000000000 --- a/regress/win32/scripts/copy-2drive-confs.cmd +++ /dev/null @@ -1,10 +0,0 @@ -COPY scripts\bacula-dir-tape.conf bin\bacula-dir.conf -COPY scripts\bacula-sd-2drive.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" >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 deleted file mode 100644 index 3e5af7aa12..0000000000 --- a/regress/win32/scripts/copy-2tape-confs.cmd +++ /dev/null @@ -1,10 +0,0 @@ -COPY scripts\bacula-dir-tape.conf bin\bacula-dir.conf -COPY scripts\bacula-sd-2tape.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 - -REM get proper SD tape definitions -COPY scripts\win32_tape_options bin\tape_options diff --git a/regress/win32/scripts/copy-confs.cmd b/regress/win32/scripts/copy-confs.cmd deleted file mode 100644 index 359839c6d8..0000000000 --- a/regress/win32/scripts/copy-confs.cmd +++ /dev/null @@ -1,7 +0,0 @@ -COPY scripts\bacula-dir.conf bin\bacula-dir.conf -COPY scripts\bacula-sd.conf bin\bacula-sd.conf -COPY scripts\bacula-fd.conf bin\bacula-fd.conf -COPY scripts\bconsole.conf bin\bconsole.conf - -REM get proper SD tape definitions -COPY scripts\win32_tape_options bin\tape_options diff --git a/regress/win32/scripts/copy-crypto-confs.cmd b/regress/win32/scripts/copy-crypto-confs.cmd deleted file mode 100644 index 7166399d97..0000000000 --- a/regress/win32/scripts/copy-crypto-confs.cmd +++ /dev/null @@ -1,5 +0,0 @@ -COPY scripts\new-test-bacula-dir.conf bin\bacula-dir.conf -COPY scripts\test-bacula-sd.conf bin\bacula-sd.conf -COPY scripts\crypto-bacula-fd.conf bin\bacula-fd.conf -COPY scripts\test-console.conf bin\bconsole.conf -COPY scripts\cryptokeypair.pem bin\cryptokeypair.pem diff --git a/regress/win32/scripts/copy-migration-confs.cmd b/regress/win32/scripts/copy-migration-confs.cmd deleted file mode 100644 index 7bf12ddbd8..0000000000 --- a/regress/win32/scripts/copy-migration-confs.cmd +++ /dev/null @@ -1,7 +0,0 @@ -REM -REM Setup for migration tests -REM -COPY scripts\bacula-dir-migration.conf bin\bacula-dir.conf -COPY scripts\bacula-sd-migration.conf bin\bacula-sd.conf -COPY scripts\test-bacula-fd.conf bin\bacula-fd.conf -COPY scripts\test-console.conf bin\bconsole.conf diff --git a/regress/win32/scripts/copy-tape-confs.cmd b/regress/win32/scripts/copy-tape-confs.cmd deleted file mode 100644 index 0a7a50a811..0000000000 --- a/regress/win32/scripts/copy-tape-confs.cmd +++ /dev/null @@ -1,7 +0,0 @@ -copy scripts\bacula-dir-tape.conf bin\bacula-dir.conf -copy scripts\bacula-sd-tape.conf bin\bacula-sd.conf -copy scripts\test-bacula-fd.conf bin\bacula-fd.conf -copy scripts\test-console.conf bin\bconsole.conf - -REM get proper SD tape definitions -copy scripts\win32_tape_options bin\tape_options diff --git a/regress/win32/scripts/copy-test-confs.cmd b/regress/win32/scripts/copy-test-confs.cmd deleted file mode 100644 index c07c5d6204..0000000000 --- a/regress/win32/scripts/copy-test-confs.cmd +++ /dev/null @@ -1,7 +0,0 @@ -COPY scripts\new-test-bacula-dir.conf bin\bacula-dir.conf -COPY scripts\test-bacula-sd.conf bin\bacula-sd.conf -COPY scripts\test-bacula-fd.conf bin\bacula-fd.conf -COPY scripts\test-console.conf bin\bconsole.conf - -REM get proper SD tape definitions -COPY scripts\win32_tape_options bin\tape_options diff --git a/regress/win32/scripts/copy-testa-confs.cmd b/regress/win32/scripts/copy-testa-confs.cmd deleted file mode 100644 index 4cc89ff02d..0000000000 --- a/regress/win32/scripts/copy-testa-confs.cmd +++ /dev/null @@ -1,7 +0,0 @@ -COPY scripts\testa-bacula-dir.conf bin\bacula-dir.conf -COPY scripts\test-bacula-sd.conf bin\bacula-sd.conf -COPY scripts\test-bacula-fd.conf bin\bacula-fd.conf -COPY scripts\test-console.conf bin\bconsole.conf - -REM get proper SD tape definitions -COPY scripts\win32_tape_options bin\tape_options diff --git a/regress/win32/scripts/copy-win32-confs.cmd b/regress/win32/scripts/copy-win32-confs.cmd deleted file mode 100644 index b9f0ab72f6..0000000000 --- a/regress/win32/scripts/copy-win32-confs.cmd +++ /dev/null @@ -1,7 +0,0 @@ -COPY scripts\win32-bacula-dir-tape.conf bin\bacula-dir.conf -COPY scripts\win32-bacula-sd-tape.conf bin\bacula-sd.conf -COPY scripts\win32-bacula-fd.conf bin\bacula-fd.conf -COPY scripts\test-console.conf bin\bconsole.conf - -REM get proper SD tape definitions -COPY scripts\win32_tape_options bin\tape_options diff --git a/regress/win32/scripts/crypto-bacula-fd.conf.in b/regress/win32/scripts/crypto-bacula-fd.conf.in deleted file mode 100644 index ec4152d2b8..0000000000 --- a/regress/win32/scripts/crypto-bacula-fd.conf.in +++ /dev/null @@ -1,36 +0,0 @@ -# -# Default Bacula File Daemon Configuration file -# -# For Bacula release 1.33 -# -# There is not much to change here except perhaps the -# File daemon Name to -# - -# -# List Directors who are permitted to contact this File daemon -# -Director { - Name = @hostname@-dir - Password = "xevrjURYoCHhn26RaJoWbeWXEY/a3VqGKp/37tgWiuHc" -} - -# -# "Global" File daemon configuration specifications -# -FileDaemon { # this is me - Name = @hostname@-fd - FDport = 8102 # where we listen for the director - WorkingDirectory = "@working_dir@" - Pid Directory = "@piddir@" - SubSys Directory = "@subsysdir@" - PKI Signatures = Yes - PKI Encryption = Yes - PKI Keypair = "@scriptdir@/cryptokeypair.pem" -} - -# Send all messages except skipped files back to Director -Messages { - Name = Standard - director = @hostname@-dir = all, !terminate -} diff --git a/regress/win32/scripts/cryptokeypair.pem b/regress/win32/scripts/cryptokeypair.pem deleted file mode 100644 index 440dcce4f0..0000000000 --- a/regress/win32/scripts/cryptokeypair.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIBOgIBAAJBAKIc649Amif6weq+c8rVtS7jyn7E9oZ9Irrl9WviQZi0+J2OLgCi -PNaj/FzPhTIgBBRFEP0ZU5DfVv6CoXKbpr8CAwEAAQJAQbvUUFvzpi5pnxPmw+Jv -+zlmjIy1Icdv47UHFN3Dl3V0+X05g12xUlnyNKzo2jlSwkBi1w8AJCMV6/TnnLiI -AQIhAM4SH9cb01DUH+1O5gk90GgNYW1Aq2vL1vygm02kppi/AiEAyWQ9eAILPXhX -H3a7mEj8z1bCTBiVrhe73NUjim4QcgECIEC3hHRj8ruBwv0eODRSy27CNQTAuJVE -ESKJtfxuZzu1AiEAotXYFbahW/x3hUs9d25ca1EdHOYr8G3kSjRT3lQMHAECIHBl -uX+Ywc1jjWhc+vN2ZrLWkKMVbrd+SWOPUQGroM0j ------END RSA PRIVATE KEY----- ------BEGIN CERTIFICATE----- -MIICKzCCAdWgAwIBAgIJAO4x/m+tHX8HMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX -aWRnaXRzIFB0eSBMdGQwHhcNMDYxMjA0MDMxMzUwWhcNMDcwMTAzMDMxMzUwWjBF -MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 -ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKIc -649Amif6weq+c8rVtS7jyn7E9oZ9Irrl9WviQZi0+J2OLgCiPNaj/FzPhTIgBBRF -EP0ZU5DfVv6CoXKbpr8CAwEAAaOBpzCBpDAdBgNVHQ4EFgQUiGz2I+bks0nCHyCI -IwuV3DpDPMwwdQYDVR0jBG4wbIAUiGz2I+bks0nCHyCIIwuV3DpDPMyhSaRHMEUx -CzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRl -cm5ldCBXaWRnaXRzIFB0eSBMdGSCCQDuMf5vrR1/BzAMBgNVHRMEBTADAQH/MA0G -CSqGSIb3DQEBBQUAA0EAkjFYcs9rrpdURlBaNlbud68VlA5rU+Bv4keYx41DUmqo -sXtkQZENR9iYYYhOUso1/1dwQgrt3egjTZTtq7o5zw== ------END CERTIFICATE----- diff --git a/regress/win32/scripts/disk-changer.cmd b/regress/win32/scripts/disk-changer.cmd deleted file mode 100644 index 3efb1933ce..0000000000 --- a/regress/win32/scripts/disk-changer.cmd +++ /dev/null @@ -1,201 +0,0 @@ -@ECHO off -setlocal ENABLEDELAYEDEXPANSION -REM -REM -REM Bacula interface to virtual autoloader using disk storage -REM -REM $Id$ -REM -REM If you set in your Device resource -REM -REM Changer Command = "disk-changer %c %o %S %a %d" -REM you will have the following input to this script: -REM -REM So Bacula will always call with all the following arguments, even though -REM in some cases, not all are used. -REM -REM disk-changer "changer-device" "command" "slot" "archive-device" "drive-index" -REM %1 %2 %3 %4 %5 -REM -REM By default the autochanger has 10 Volumes and 1 Drive. -REM -REM Note: For this script to work, you *must" specify -REM Device Type = File -REM in each of the Devices associated with your AutoChanger resource. -REM -REM changer-device is the name of a file that overrides the default -REM volumes and drives. It may have: -REM maxslot=n where n is one based (default 10) -REM maxdrive=m where m is zero based (default 1 -- i.e. 2 drives) -REM -REM This code can also simulate barcodes. You simply put -REM a list of the slots and barcodes in the "base" directory/barcodes. -REM See below for the base directory definition. Example of a -REM barcodes file: -REM C:\TEMP\bacula\barcodes -REM 1:Vol001 -REM 2:Vol002 -REM ... -REM -REM archive-device is the name of the base directory where you want the -REM Volumes stored appended with \drive0 for the first drive; \drive1 -REM for the second drive, ... For example, you might use -REM C:\Temp\bacula\drive0 Note: you must not have a trailing slash, and -REM the string (e.g. \drive0) must be unique, and it must not match -REM any other part of the directory name. These restrictions could be -REM easily removed by any clever script jockey. -REM -REM Full example: disk-changer C:\Temp\bacula\conf load 1 C:\Temp\bacula\drive0 0 -REM -REM The Volumes will be created with names slot1, slot2, slot3, ... maxslot in the -REM base directory. In the above example the base directory is C:\Temp\bacula. -REM However, as with tapes, their Bacula Volume names will be stored inside the -REM Volume label. In addition to the Volumes (e.g. C:\Temp\bacula\slot1, -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 - -REM to turn on logging, uncomment the following line -IF NOT EXIST %dbgfile% COPY nul %dbgfile% >nul - -REM -REM check parameter count on commandline -REM -REM Check for special cases where only 2 arguments are needed, -REM all others are a minimum of 5 -REM -IF "%1" EQU "" goto :param_count_invalid -IF "%2" EQU "" goto :param_count_invalid -IF "%2" EQU "list" goto :param_count_valid -IF "%2" EQU "slots" goto :param_count_valid -IF "%3" EQU "" goto :param_count_invalid -IF "%4" EQU "" goto :param_count_invalid -IF "%5" EQU "" goto :param_count_invalid -GOTO :param_count_valid - -:param_count_invalid - echo Insufficient number of arguments given. - IF "%2" EQU "" ( - echo At least two arguments must be specified. - ) else echo Command expected 5 arguments. -:usage - ECHO. - ECHO usage: disk-changer ctl-device command [slot archive-device drive-index] - ECHO Valid commands are: unload, load, list, loaded, and slots. - EXIT /B 1 - -:param_count_valid - -REM Setup arguments -SET ctl=%1 -SET cmd=%2 -SET slot=%3 -SET device=%4 -SET drive=%5 - -REM set defaults -SET maxdrive=1 -SET maxslot=10 - -SET ctl=%ctl:/=\% -SET ctl=%ctl:\\=\% - -SET device=%device:/=\% -SET device=%device:\\=\% - -REM Pull in conf file -IF EXIST %ctl% CALL %ctl% - -FOR %%i IN ( %ctl% ) DO SET dirname=%%~dpi -IF NOT EXIST %dirname%nul ( - ECHO ERROR: Autochanger directory "%dirname%" does not exist. - ECHO You must create it. - EXIT /b 1 -) - -CALL :debug "Parms: %ctl% %cmd% %slot% %device% %drive%" -IF "%cmd%" EQU "unload" GOTO :cmdUnload -IF "%cmd%" EQU "load" GOTO :cmdLoad -IF "%cmd%" EQU "list" GOTO :cmdList -IF "%cmd%" EQU "loaded" GOTO :cmdLoaded -IF "%cmd%" EQU "slots" GOTO :cmdSlots -GOTO :cmdUnknown - -:cmdUnload - CALL :debug "Doing disk -f %ctl% unload %slot% %device% %drive%" - IF NOT EXIST %dirname%loaded%drive% ECHO 0 >%dirname%loaded%drive% - FOR /f %%i IN ( %dirname%loaded%drive% ) DO SET ld=%%i - - IF "%slot%" EQU "%ld%" ( - CALL :debug "Unloaded slot %ld% from drive %drive%" - ECHO 0 >%dirname%loaded%drive% - DEL %dirname%%device% >nul 2>nul - SET rtn=0 - ) ELSE ( - ECHO Storage Element %slot% is Already Full - CALL :debug "Storage Element %slot% is Already Full" - SET rtn=1 - ) - GOTO :cmdExit - -:cmdLoad - CALL :debug "Doing disk -f %ctl% load %slot% %device% %drive%" - SET ld=0 - IF NOT EXIST %dirname%loaded%drive% ECHO 0 >%dirname%loaded%drive% - FOR /f %%i IN ( %dirname%loaded%drive% ) DO SET ld=%%i - IF %ld% EQU 0 ( - IF NOT EXIST %dirname%slot%slot% COPY nul %dirname%slot%slot% >nul - DEL %device% - fsutil hardlink create %device% %dirname%slot%slot% >nul 2>&1 - SET rtn=%ERRORLEVEL% - IF !rtn! EQU 0 ( - ECHO %slot% >%dirname%loaded%drive% - CALL :debug "Loaded slot %slot% into drive %drive%" - ) ELSE ( - CALL :debug "Create hardlink failed, return = !rtn!" - ) - ) ELSE ( - ECHO Drive %drive% Full - Storage element %ld% loaded - CALL :debug "Drive %drive% Full - Storage element %ld% loaded" - ) - GOTO :cmdExit - -:cmdList - CALL :debug "Doing disk -f %ctl% -- to list volumes" - IF EXIST %dirname%barcodes ( - TYPE %dirname%barcodes - ) ELSE ( - FOR /l %%i IN ( 1, 1, %maxslot% ) DO ECHO %%i: - ) - SET rtn=0 - GOTO :cmdExit - -:cmdLoaded - CALL :debug "Doing disk -f %ctl% %drive% -- to find what is loaded" - IF EXIST %dirname%loaded%drive% ( TYPE %dirname%loaded%drive% ) ELSE ECHO 0 - SET rtn=0 - GOTO :cmdExit - -:cmdSlots - CALL :debug "Doing disk -f %ctl% -- to get count of slots" - ECHO %maxslot% - SET rtn=0 - GOTO :cmdExit - -:cmdExit - EXIT /b %rtn% - -:cmdUnknown - ECHO '%cmd%' is an invalid command. - GOTO :usage - -REM -REM log whats done -REM -:debug - IF NOT EXIST %dbgfile% GOTO :EOF - FOR /f "usebackq tokens=2-4,5-7 delims=/:. " %%i IN ( '%DATE% %TIME%' ) do SET TIMESTAMP=%%k%%i%%j-%%l:%%m:%%n - ECHO %TIMESTAMP% %* >> %dbgfile% - GOTO :EOF diff --git a/regress/win32/scripts/do_sed.cmd b/regress/win32/scripts/do_sed.cmd deleted file mode 100644 index a533a303f8..0000000000 --- a/regress/win32/scripts/do_sed.cmd +++ /dev/null @@ -1,73 +0,0 @@ -IF "%1" == "" GOTO :usage -IF "%2" == "" GOTO :usage -IF "%3" == "" GOTO :usage -IF "%4" == "" GOTO :usage -IF "%5" == "" GOTO :usage -IF "%6" == "" GOTO :usage -GOTO :args_ok - -:usage -ECHO First arg must be email name -ECHO and the second must be the smtp or email host -ECHO and the third must be a tape drive -ECHO and the fourth must be a tape control name or nul -ECHO and the fifth must be the full path to the mtx program -ECHO and the sixth must be tape drive 1 or nul -EXIT /b 1 - -:args_ok -SET out=tmp\sed_tmp - -REM Create sed command script - -ECHO s;@sbindir@;%CD:\=/%/bin;g >%out% -ECHO s;@scriptdir@;%CD:\=/%/scripts;g >>%out% -ECHO s;@working_dir@;%CD:\=/%/working;g >>%out% -ECHO s;@piddir@;%CD:\=/%/working;g >>%out% -ECHO s;@subsysdir@;%CD:\=/%/working;g >>%out% -ECHO s;@job_email@;%1;g >>%out% -ECHO s;@smtp_host@;%2;g >>%out% -ECHO s;@tape_drive@;%3;g >>%out% -ECHO s;@autochanger@;%4;g >>%out% -ECHO s;@tmpdir@;%CD:\=/%/tmp;g >>%out% -ECHO s;@hostname@;localhost;g >>%out% -ECHO s;@changer_path@;%5;g >>%out% -ECHO s;@tape_drive1@;%6;g >>%out% -ECHO s;@disk_drive@;%CD:\=/%/tmp/disk-changer;g >>%out% -ECHO s;@smtp_program@;%CD:\=/%/bin/bsmtp;g >>%out% - -ECHO SET AUTOCHANGER=%4 >config_out.cmd -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 - -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 - -REM get proper SD tape definitions -COPY %CD%\scripts\win32_tape_options %CD%\bin\tape_options >nul - -DEL %out% -DEL tmp\*.tmp diff --git a/regress/win32/scripts/exclude-dev-test b/regress/win32/scripts/exclude-dev-test deleted file mode 100644 index 4165ea1ae7..0000000000 --- a/regress/win32/scripts/exclude-dev-test +++ /dev/null @@ -1,5 +0,0 @@ -dev/ptmx -dev/pts -dev/rd/c5d2 -dev/rd -dev/shm diff --git a/regress/win32/scripts/exclude-etc-test b/regress/win32/scripts/exclude-etc-test deleted file mode 100644 index f59ca8df2a..0000000000 --- a/regress/win32/scripts/exclude-etc-test +++ /dev/null @@ -1 +0,0 @@ -etc/mail/statistics diff --git a/regress/win32/scripts/exclude-lib-test b/regress/win32/scripts/exclude-lib-test deleted file mode 100644 index 5be32f443b..0000000000 --- a/regress/win32/scripts/exclude-lib-test +++ /dev/null @@ -1,5 +0,0 @@ -lib/ld-2.2.5.so -lib/libtermcap.so.2.0.8 -lib/libc-2.2.5.so -lib/libnsl-2.2.5.so -lib/libnss_files-2.2.5.so diff --git a/regress/win32/scripts/flist b/regress/win32/scripts/flist deleted file mode 100644 index 87f103defe..0000000000 --- a/regress/win32/scripts/flist +++ /dev/null @@ -1,23 +0,0 @@ -/build/configure -/build/src/stored/bextract -/build/src/tools/testfind -/build/Makefile.in -/build/src/dird/bacula-dir -/build/src/console/bconsole -/build/src/filed/bacula-fd -/build/src/findlib/find_one.c -/build/src/jcr.h -/build/platforms/Makefile.in -/build/platforms/redhat/Makefile.in -/build/scripts/Makefile.in -/build/src/win32/filed/winservice.cpp -/build/src/filed/restore.c -/build/autoconf/configure.in -/build/examples/afs-bacula -/build/src/win32/Makefile.inc.in -/build/src/win32/installer/winbacula.nsi -/build/autoconf/configure.in -/build/src/version.h -/build/src/lib/message.c -/build/src/lib/bnet_server.c -/build/src/lib/libbac.a diff --git a/regress/win32/scripts/functions.cmd b/regress/win32/scripts/functions.cmd deleted file mode 100644 index 1a03141c14..0000000000 --- a/regress/win32/scripts/functions.cmd +++ /dev/null @@ -1,131 +0,0 @@ -REM -REM A set of useful functions to be sourced in each test -REM - -SET routine=%1 -SHIFT - -GOTO %routine% - -:start_test - ECHO. - ECHO. - ECHO === Starting %TestName% at %TIME% === - ECHO === Starting %TestName% at %TIME% === >>working\log - ECHO. - GOTO :EOF - -:set_debug - SET debug=%1 - IF "%debug%" EQU 1 ( - SET out=tee - ) ELSE ( - SET out=output - ) - GOTO :EOF - -:run_bacula - IF %debug% EQU 1 ( - CALL scripts\bacula start - bin\bconsole -c bin\bconsole.conf nul 2>&1 - bin\bconsole -c bin\bconsole.conf nul 2>&1 - ) - GOTO :EOF - -:run_bconsole - IF %debug% EQU 1 ( - bin\bconsole -c bin\bconsole.conf nul 2>&1 - ) - GOTO :EOF - -:run_btape - IF %debug% EQU 1 ( - bin\btape -c bin\bacula-sd.conf DDS-4 tmp\log1.out 2>&1 - ) - GOTO :EOF - -:run_bscan - IF %debug% EQU 1 ( - bin\bscan %1 %2 %3 %4 %5 %6 %7 %8 %9 | tools\tee tmp\log.out - ) ELSE ( - bin\bscan %1 %2 %3 %4 %5 %6 %7 %8 %9 >nul 2>&1 - ) - GOTO :EOF - -:stop_bacula - CALL scripts\bacula stop >nul 2>&1 - GOTO :EOF - -:check_for_zombie_jobs - CALL scripts\check_for_zombie_jobs %1 %2 - GOTO :EOF - -:change_jobname - IF "%2" == "" ( - SET oldname=NightlySave - SET newname=%1 - ) ELSE ( - SET oldname=%1 - SET newname=%2 - ) - 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 -REM ECHO Job %oldname% changed to %newname% - GOTO :EOF - -:check_two_logs - tools\grep "^ Termination: *Backup OK" tmp\log1.out >nul 2>&1 - SET bstat=%ERRORLEVEL% - tools\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 - SET dstat=%ERRORLEVEL% - GOTO :EOF - -:check_restore_tmp_build_diff - tools\diff -r tmp\build tmp\bacula-restores\%CD::=%\tmp\build >nul 2>&1 - SET dstat=%ERRORLEVEL% - GOTO :EOF - -:end_test - SET /a errcount=%bstat% + %rstat% + %dstat% - IF %errcount% NEQ 0 ( - ECHO. - ECHO. - ECHO !!!!! %TestName% Bacula source failed!!! !!!!! - ECHO !!!!! %TestName% failed!!! !!!!! >>test.out - IF %dstat% NEQ 0 ( - ECHO !!!!! Restored files differ !!!!! - ECHO !!!!! Restored files differ !!!!! >>test.out - ) ELSE ( - ECHO !!!!! Bad Job termination status !!!!! - ECHO !!!!! Bad Job termination status !!!!! >>test.out - ) - ECHO. - ) ELSE ( - ECHO ===== %TestName% Bacula source OK %TIME% ===== - ECHO ===== %TestName% OK %TIME% ===== >>test.out - IF %debug% EQU 0 scripts\cleanup - ) - SET errcount= - GOTO :EOF - -:copy_tape_confs - CALL scripts\copy-tape-confs >nul 2>&1 - CALL scripts\cleanup-tape - GOTO :EOF - -:copy_test_confs - CALL scripts\copy-test-confs >nul 2>&1 - CALL scripts\cleanup - GOTO :EOF diff --git a/regress/win32/scripts/install_bacula.cmd b/regress/win32/scripts/install_bacula.cmd deleted file mode 100644 index fa7dad4af7..0000000000 --- a/regress/win32/scripts/install_bacula.cmd +++ /dev/null @@ -1,76 +0,0 @@ -REM Arguments: -REM 1 = Debug or Release -REM 2 = email address -REM 3 = mail server -REM 4 = tape device -REM 5 = changer device or nul -REM 6 = tape1 device or nul - -SETLOCAL ENABLEDELAYEDEXPANSION - -SET CATS=create_sqlite3_database.cmd drop_sqlite3_database.cmd drop_sqlite3_tables.cmd grant_sqlite3_privileges.cmd make_sqlite3_catalog_backup.cmd make_sqlite3_tables.cmd - -SET CONFS=bacula-dir.conf.in bacula-fd.conf.in bacula-sd.conf.in bconsole.conf.in - -CALL scripts\bacula stop - -IF NOT EXIST bin MKDIR bin - -COPY build\src\win32\installer\%1\*.exe bin >nul -COPY build\src\win32\installer\%1\*.dll bin >nul -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_sqlite.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 -FOR /f %%i IN ( 'cmd /c openssl.exe rand -base64 33 2^>nul' ) DO SET DIRECTOR_PASSWORD=%%i -FOR /f %%i IN ( 'cmd /c openssl.exe rand -base64 33 2^>nul' ) DO SET MONITOR_PASSWORD=%%i - -ECHO s;@director_name@;localhost-dir;g >install.sed -ECHO s;@director_port@;8101;g >>install.sed -ECHO s;@storage_name@;localhost-sd;g >>install.sed -ECHO s;@storage_port@;8103;g >>install.sed -ECHO s;@client_name@;localhost-fd;g >>install.sed -ECHO s;@client_port@;8102;g >>install.sed - -REM ECHO s;@DISTVER@;$R2; - -ECHO s;@working_dir@;%CD:\=\\\\%\\\\working;g >>install.sed -ECHO s;@working_dir_cmd@;%CD:\=\\%\\working;g >>install.sed -ECHO s;@bin_dir@;%CD:\=\\\\%\\\\bin;g >>install.sed; -ECHO s;@bin_dir_cmd@;%CD:\=\\%\\bin;g >>install.sed -ECHO s;@BUILD_DIR@;%CD:\=/%/build;g >>install.sed -ECHO s;@director_address@;localhost;g >>install.sed -ECHO s;@client_address@;localhost;g >>install.sed -ECHO s;@storage_address@;localhost;g >>install.sed -ECHO s;@client_maxjobs@;2;g >>install.sed -ECHO s;@client_password@;%CLIENT_PASSWORD%;g >>install.sed -ECHO s;@storage_maxjobs@;10;g >>install.sed -ECHO s;@storage_password@;%STORAGE_PASSWORD%;g >>install.sed -ECHO s;@director_maxjobs@;1;g >>install.sed -ECHO s;@director_password@;%DIRECTOR_PASSWORD%;g >>install.sed -ECHO s;@job_email@;%2;g >>install.sed -ECHO s;@smtp_host@;%3;g >>install.sed -ECHO s;@monitor_name@;localhost-mon;g >>install.sed -ECHO s;@monitor_password@;%MONITOR_PASSWORD%;g >>install.sed -ECHO s;@tape_drive@;%4;g >>install.sed -ECHO s;@autochanger@;%5;g >>install.sed -ECHO s;@changer_path@;%6;g >>install.sed -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! -) - -FOR %%i in ( %CONFS% ) DO tools\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 - -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 deleted file mode 100644 index 7302f0c73d..0000000000 --- a/regress/win32/scripts/new-test-bacula-dir.conf.in +++ /dev/null @@ -1,326 +0,0 @@ -# -# Default Bacula Director Configuration file -# -# The only thing that MUST be changed is to add one or more -# file or directory names in the Include directive of the -# FileSet resource. -# -# For Bacula release 1.39 or later -# -# You might also want to change the default email address -# from root to your address. See the "mail" and "operator" -# directives in the Messages resource. -# - -Director { # define myself - Name = @hostname@-dir - DIRport = 8101 # where we listen for UA connections - QueryFile = "@scriptdir@/query.sql" - WorkingDirectory = "@working_dir@" - PidDirectory = "@piddir@" - SubSysDirectory = "@subsysdir@" - Maximum Concurrent Jobs = 4 - Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password - Messages = Standard -} - -# -# Define the main nightly save backup job -# By default, this job will back up to disk in /tmp -Job { - Name = "NightlySave" - Type = Backup - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" - Maximum Concurrent Jobs = 4 - SpoolData=yes -} - -Job { - Name = "Crypto" - Type = Backup - Client=@hostname@-fd - FileSet="SparseCompressedSet" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" - Maximum Concurrent Jobs = 4 - SpoolData=yes -} - - -Job { - Name = "MonsterSave" - Type = Backup - Client=@hostname@-fd - FileSet="Full Set" - Storage = File1 - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -Job { - Name = "VerifyVolume" - Type = Verify - Level = VolumeToCatalog - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -Job { - Name = "SparseTest" - Type = Backup - Client=@hostname@-fd - FileSet="SparseSet" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - -Job { - Name = "CompressedTest" - Type = Backup - Client=@hostname@-fd - FileSet="CompressedSet" - Storage = File - Messages = Standard - Pool = Default - Maximum Concurrent Jobs = 4 - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - -Job { - Name = "SparseCompressedTest" - Type = Backup - Client=@hostname@-fd - FileSet="SparseCompressedSet" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -# Backup the catalog database (after the nightly save) -Job { - Name = "BackupCatalog" - Type = Backup - Client=@hostname@-fd - FileSet="Catalog" -# Schedule = "WeeklyCycleAfterBackup" - Storage = File - Messages = Standard - Pool = Default - # This creates an ASCII copy of the catalog - RunBeforeJob = "@sbindir@/make_catalog_backup -u bacula" - # This deletes the copy of the catalog - RunAfterJob = "@sbindir@/delete_catalog_backup" - Write Bootstrap = "@working_dir@/BackupCatalog.bsr" -} - -# Standard Restore template, to be changed by Console program -Job { - Name = "RestoreFiles" - Type = Restore - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Where = /tmp/bacula-restores -} - - -# List of files to be backed up -FileSet { - Name = "Full Set" - Include { Options { signature=MD5 } - File = nul 2>&1 -MKDIR tmp\disk-changer diff --git a/regress/win32/scripts/prepare-two-tapes.cmd.in b/regress/win32/scripts/prepare-two-tapes.cmd.in deleted file mode 100644 index 1bcd81898b..0000000000 --- a/regress/win32/scripts/prepare-two-tapes.cmd.in +++ /dev/null @@ -1,13 +0,0 @@ -REM -REM Create two blank tapes -REM -REM mt -f @tape_drive@ offline -@changer_path@ -f @autochanger@ unload -@changer_path@ -f @autochanger@ load 1 -mt -f @tape_drive@ rewind -mt -f @tape_drive@ weof -@changer_path@ -f @autochanger@ unload -@changer_path@ -f @autochanger@ load 2 -mt -f @tape_drive@ rewind -mt -f @tape_drive@ weof -REM @changer_path@ -f @autochanger@ unload diff --git a/regress/win32/scripts/setup.cmd b/regress/win32/scripts/setup.cmd deleted file mode 100644 index 53df74dcfd..0000000000 --- a/regress/win32/scripts/setup.cmd +++ /dev/null @@ -1,55 +0,0 @@ -REM -REM Script to setup running Bacula regression tests -REM - -IF "%1" == "" GOTO :usage -IF "%2" == "" GOTO :usage -IF "%3" == "" GOTO :usage -IF "%4" == "" GOTO :usage -IF "%5" == "" GOTO :usage -IF "%6" == "" GOTO :usage -IF "%7" == "" GOTO :usage -GOTO :param_count_ok - -:usage -ECHO Incorrect number of arguments. -ECHO setup bacula-src build-type email-address smtp-host tape-device changer-device tape1-device -ECHO. -EXIT /b 1 - -:param_count_ok -RD /s /q build bin tmp working >nul 2>&1 -MKDIR tmp - -REM Copy new source -ECHO Copying source from %1 -SET SRC=%1 -FOR /r %1 %%i in ( debug release ) do IF EXIST %%i ECHO %%i | sed -e "s;%SRC:\=\\%\\;;" -e "/installer\\%2/d" -e "/win32\\%2/d" >>tmp\exclude_list -ECHO .bsc >>tmp\exclude_list -ECHO .ncb >>tmp\exclude_list - -XCOPY %1 build\ /EXCLUDE:tmp\exclude_list /e /q - -DEL build\src\win32\%2\winbacula*.exe - -CALL scripts\install_bacula %2 %3 %4 %5 %6 %7 - -CALL scripts\bacula stop >nul 2>&1 - -IF NOT EXIST working MKDIR working -ECHO Running database creation scripts -CALL bin\create_bacula_database -CALL bin\drop_bacula_tables -CALL bin\make_bacula_tables -CALL bin\grant_bacula_privileges - -REM Start and stop Bacula to ensure conf files are OK - -CALL scripts\bacula start -CALL scripts\bacula stop >nul 2>&1 - -REM -REM Save Bacula default conf files for later use -REM -COPY bin\*.conf scripts >nul -GOTO :EOF diff --git a/regress/win32/scripts/test-bacula-dir.conf.in b/regress/win32/scripts/test-bacula-dir.conf.in deleted file mode 100644 index 93008cca82..0000000000 --- a/regress/win32/scripts/test-bacula-dir.conf.in +++ /dev/null @@ -1,312 +0,0 @@ -# -# Default Bacula Director Configuration file -# -# The only thing that MUST be changed is to add one or more -# file or directory names in the Include directive of the -# FileSet resource. -# -# For Bacula release 1.33 -# -# You might also want to change the default email address -# from root to your address. See the "mail" and "operator" -# directives in the Messages resource. -# - -Director { # define myself - Name = @hostname@-dir - DIRport = 8101 # where we listen for UA connections - QueryFile = "@scriptdir@/query.sql" - WorkingDirectory = "@working_dir@" - PidDirectory = "@piddir@" - SubSysDirectory = "@subsysdir@" - Maximum Concurrent Jobs = 4 - Password = "pNvX1WiXnwv2C/F7E52LGvw6rKjbbPvu2kyuPa9pVaL3" # Console password - Messages = Daemon -} - -# -# Define the main nightly save backup job -# By default, this job will back up to disk in /tmp -Job { - Name = "NightlySave" - Type = Backup - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" - Maximum Concurrent Jobs = 4 - SpoolData=yes -} - -Job { - Name = "MonsterSave" - Type = Backup - Client=@hostname@-fd - FileSet="Full Set" - Storage = File1 - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -Job { - Name = "VerifyVolume" - Type = Verify - Level = VolumeToCatalog - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -Job { - Name = "SparseTest" - Type = Backup - Client=@hostname@-fd - FileSet="SparseSet" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - -Job { - Name = "CompressedTest" - Type = Backup - Client=@hostname@-fd - FileSet="CompressedSet" - Storage = File - Messages = Standard - Pool = Default - Maximum Concurrent Jobs = 4 - Write Bootstrap = "@working_dir@/NightlySave.bsr" -# Max Run Time = 15 seconds -} - -Job { - Name = "SparseCompressedTest" - Type = Backup - Client=@hostname@-fd - FileSet="SparseCompressedSet" - Storage = File - Messages = Standard - Pool = Default - Write Bootstrap = "@working_dir@/NightlySave.bsr" -} - - -# Backup the catalog database (after the nightly save) -Job { - Name = "BackupCatalog" - Type = Backup - Client=@hostname@-fd - FileSet="Catalog" -# Schedule = "WeeklyCycleAfterBackup" - Storage = File - Messages = Standard - Pool = Default - # This creates an ASCII copy of the catalog - RunBeforeJob = "@sbindir@/make_catalog_backup -u bacula" - # This deletes the copy of the catalog - RunAfterJob = "@sbindir@/delete_catalog_backup" - Write Bootstrap = "@working_dir@/BackupCatalog.bsr" -} - -# Standard Restore template, to be changed by Console program -Job { - Name = "RestoreFiles" - Type = Restore - Client=@hostname@-fd - FileSet="Full Set" - Storage = File - Messages = Standard - Pool = Default - Where = /tmp/bacula-restores -} - - -# List of files to be backed up -FileSet { - Name = "Full Set" - Include { Options { signature=MD5 } - File = nul 2>&1 -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 -IF NOT EXIST tmp\build MKDIR tmp\build -COPY build\src\dird\*.c tmp\build >nul 2>&1 - -ECHO %CD:\=/%/tmp/build/ficheriro1.txt>tmp\restore-list -ECHO %CD:\=/%/tmp/build/ficheriro2.txt>>tmp\restore-list - -REM Turn off Prefer Mounted Volumes so we use2 drives -COPY bin\bacula-dir.conf tmp\1 >nul 2>&1 -REM Comment the next line out to write everything to one drive -REM otherwise, it writes the two jobs to different drives -sed -e "s;# Prefer Mounted Volumes; Prefer Mounted Volumes;g" tmp\1 >bin\bacula-dir.conf - -REM Write out bconsole commands -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\2drive-incremental-2disk.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -ECHO ficheriro1.txt >tmp\build\ficheriro1.txt -ECHO ficheriro2.txt >tmp\build\ficheriro2.txt - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\2drive-incremental-2disk.2.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -CALL scripts\functions check_for_zombie_jobs storage=DDS-4 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -REM The restore should read from TestVolume002, which was on drive 1 -grep TestVolume002 tmp\log2.out >nul 2>&1 -IF %ERRORLEVEL% NEQ 0 SET rstat=%ERRORLEVEL% - -REM -REM Delete .c files because we will only restored the txt files -REM -DEL tmp\build\*.c -CALL scripts\functions check_restore_tmp_build_diff - -CALL scripts\functions end_test diff --git a/regress/win32/tests/2drive-incremental-2tape b/regress/win32/tests/2drive-incremental-2tape deleted file mode 100644 index a301c1ca55..0000000000 --- a/regress/win32/tests/2drive-incremental-2tape +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do an Incremental and restore those two files. -# -# This script uses the autochanger and two tapes -# -. config.out -if test x${TAPE_DRIVE1} = x/dev/null ; then - echo "Skipping 2drive-incremenatal-2tape test. No second drive." - exit -fi -TestName="2drive-incremental-2tape" -JobName="2drive2tape" -. scripts/functions -set_debug 0 - -cwd=`pwd` - -scripts/copy-2drive-confs -scripts/cleanup-2drive - -change_jobname localhost-fd $JobName - -echo "${cwd}/tmp/build" >/tmp/file-list -if test ! -d ${cwd}/tmp/build ; then - mkdir ${cwd}/tmp/build -fi -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -# Turn off Prefer Mounted Volumes so we use 2 drives -outf="tmp/sed_tmp" -echo "s%# Prefer Mounted Volumes% Prefer Mounted Volumes%g" >${outf} -cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1 -# Comment the next line out to write everything to one drive -# otherwise, it writes the two jobs to different drives -sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf - -start_test - -# Write out bconsole commands -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1 -@#setdebug level=100 storage=DDS-4 -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -run job=NightlySave yes -@sleep 3 -status storage=DDS-4 -wait -list volumes -list jobs -status storage=DDS-4 -messages -quit -END_OF_DATA - -run_bacula - -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -@# Force Incremental on the second Volume -update volume=TestVolume001 VolStatus=Used -status storage=DDS-4 -@#setdebug level=400 storage=DDS-4 -run level=Incremental job=NightlySave yes -wait -list volumes -status storage=DDS-4 -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c -check_restore_tmp_build_diff - -end_test diff --git a/regress/win32/tests/auto-label-test.bscr b/regress/win32/tests/auto-label-test.bscr deleted file mode 100644 index c33c0a6a42..0000000000 --- a/regress/win32/tests/auto-label-test.bscr +++ /dev/null @@ -1,35 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -status all -status all -list pools -messages -@#setdebug level=110 storage=File -run job=@JobName@ storage=File yes -list pools -list volumes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File -unmark * -mark * -count -ls * -dir * -find Makefile -pwd -lsmark -estimate -? -help -done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/auto-label-test.cmd b/regress/win32/tests/auto-label-test.cmd deleted file mode 100644 index 218ded6d07..0000000000 --- a/regress/win32/tests/auto-label-test.cmd +++ /dev/null @@ -1,27 +0,0 @@ -REM -REM Test if Bacula can automatically create a Volume label. -REM - -SET TestName=auto-label-test -SET JobName=AutoLabel - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -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 - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\auto-label-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/backup-bacula-tape b/regress/win32/tests/backup-bacula-tape deleted file mode 100644 index 21d521d563..0000000000 --- a/regress/win32/tests/backup-bacula-tape +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# We also use the purge and the relabel commands as -# well as a pile of status storage commands. -# -TestName="backup-bacula-tape" -JobName=backuptape -. scripts/functions -set_debug 0 - -scripts/copy-tape-confs -scripts/cleanup-tape - -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - - -# Write out bconsole commands -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -@#setdebug level=200 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -purge volume=TestVolume001 -relabel pool=Default storage=DDS-4 oldVolume=TestVolume001 volume=TestVolume002 slot=0 -purge volume=TestVolume002 -relabel pool=Default storage=DDS-4 oldVolume=TestVolume002 volume=TestVolume001 slot=0 -run job=$JobName yes -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -@sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -@sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -@sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -@sleep 1 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -status storage=DDS-4 -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -list volumes -messages -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -# -# Now do a second backup after making a few changes -# -touch ${cwd}/build/src/dird/*.c -echo "test test" > ${cwd}/build/src/dird/xxx - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -list volumes -run job=$JobName yes -wait -list volumes -messages -@# -@# now do a second restore -@# -@$out tmp/log2.out -list volumes -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -list volumes -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/backup-bacula-test.bscr b/regress/win32/tests/backup-bacula-test.bscr deleted file mode 100644 index c6c22e9dae..0000000000 --- a/regress/win32/tests/backup-bacula-test.bscr +++ /dev/null @@ -1,36 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label volume=TestVolume001 -@#setdebug level=100 storage=File -run job=@JobName@ yes -status storage=File -status storage=File -status storage=File -status storage=File -status storage=File -status storage=File -@sleep 1 -status storage=File -status storage=File -status storage=File -status storage=File -status storage=File -@sleep 1 -status storage=File -status storage=File -status storage=File -status storage=File -status storage=File -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select all done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/backup-bacula-test.cmd b/regress/win32/tests/backup-bacula-test.cmd deleted file mode 100644 index dafec1d622..0000000000 --- a/regress/win32/tests/backup-bacula-test.cmd +++ /dev/null @@ -1,24 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory -REM then restore it. -REM - -SET TestName=backup-bacula-test -SET JobName=backup -CALL scripts\functions set_debug 0 - -CALL scripts\cleanup -CALL scripts\copy-confs >nul 2>&1 - -CALL scripts\functions change_jobname Client1 %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\backup-bacula-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/backup-win32-tape b/regress/win32/tests/backup-win32-tape deleted file mode 100644 index f6f6c3b0c0..0000000000 --- a/regress/win32/tests/backup-win32-tape +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# -TestName="backup-win32-tape" -JobName=backupwintape -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-win32-confs - -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=NightlySave yes -@sleep 10 -status storage=DDS-4 -@sleep 30 -messages -wait -messages -@# -@# now do a restore -@# -@$outt tmp/log2.out -@#restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -@#yes -@#wait -@#messages -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/bextract-test.bscr b/regress/win32/tests/bextract-test.bscr deleted file mode 100644 index 090d518da0..0000000000 --- a/regress/win32/tests/bextract-test.bscr +++ /dev/null @@ -1,21 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File1 volume=TestVolume001 -label storage=File1 volume=TestVolume002 -update Volume=TestVolume001 MaxVolBytes=3000000 -@#setdebug level=400 dir -@#setdebug level=400 storage=File1 -run job=@JobName@ storage=File1 yes -wait -messages -@# -@# now build the bsr file -@# -@@out@ tmp/log2.out -restore bootstrap=@topdir@/working/restore.bsr where=@topdir@/tmp/bacula-restores select all storage=File1 done -no -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/bextract-test.cmd b/regress/win32/tests/bextract-test.cmd deleted file mode 100644 index c119764c5e..0000000000 --- a/regress/win32/tests/bextract-test.cmd +++ /dev/null @@ -1,29 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory but -REM split the archive into two volumes, then build a BSR with -REM the restore command and use bextract to restore the files. -REM -SET TestName=bextract-test -SET JobName=bextract - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\bextract-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File1 -CALL scripts\functions stop_bacula - -MKDIR %CD%\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 -SET bstat=%ERRORLEVEL% -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/bscan-fast-tape b/regress/win32/tests/bscan-fast-tape deleted file mode 100644 index fcb7e921ba..0000000000 --- a/regress/win32/tests/bscan-fast-tape +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then -# do a bscan and restore. -# It should require at least 4 different bsrs. -# -TestName="bscan-tape" -JobName=bscantape -. scripts/functions -set_debug 1 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -# sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -setdebug level=2 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -echo "Starting Bacula tape writing" -#bin/btape -c bin/bacula-sd.conf /dev/nst0 </dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. - -echo "Begin attempt to read tape that crashes the system" -echo "volume=TestVolume001" >tmp/bscan.bsr -strace -o strace.new bin/bscan -d200 -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 -exit -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log2.out -@# -@# now do a restore -@# -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula -rm -f ${cwd}/build/src/lib/dummy - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/bscan-tape b/regress/win32/tests/bscan-tape deleted file mode 100644 index 7f7e708c1e..0000000000 --- a/regress/win32/tests/bscan-tape +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then -# do a bscan and restore. -# It should require at least 4 different bsrs. -# -TestName="bscan-tape" -JobName=bscantape -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -estimate job=$JobName listing -estimate job=$JobName listing -estimate job=$JobName listing -messages -@$out tmp/log1.out -setdebug level=2 storage=DDS-4 -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -run job=$JobName level=Full yes -wait -run job=$JobName level=Full yes -wait -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 - -echo "Backup 1 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o - -# -# run a second job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA - -run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 - -echo "Backup 2 done" -touch ${cwd}/build/src/dird/*.c -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -# -# run a third job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA - -run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 - -echo "Backup 3 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -#echo "abc" > ${cwd}/build/src/lib/dummy -# -# run a fourth job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA - -run_bacula - -scripts/check_for_zombie_jobs storage=DDS-4 -stop_bacula - -echo "Backup 4 done" -# -# now drop and recreate the database -# -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. - -echo "volume=TestVolume001" >tmp/bscan.bsr -bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 2>&1 >/dev/null - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log2.out -@# -@# now do a restore -@# -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula -rm -f ${cwd}/build/src/lib/dummy - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/bscan-test.1.bscr b/regress/win32/tests/bscan-test.1.bscr deleted file mode 100644 index 2ed6803e27..0000000000 --- a/regress/win32/tests/bscan-test.1.bscr +++ /dev/null @@ -1,24 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=File1 -TestVolume001 -label storage=File1 -TestVolume002 -update Volume=TestVolume001 MaxVolBytes=3000000 -run job=@JobName@ storage=File1 -yes -wait -messages -@@out@ nul -@# -@# now purge the Volume -@# -purge volume=TestVolume001 -purge volume=TestVolume002 -delete volume=TestVolume001 -yes -delete volume=TestVolume002 -yes -messages -quit diff --git a/regress/win32/tests/bscan-test.2.bscr b/regress/win32/tests/bscan-test.2.bscr deleted file mode 100644 index 9e80679312..0000000000 --- a/regress/win32/tests/bscan-test.2.bscr +++ /dev/null @@ -1,13 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log2.out -@# -@# now do a restore -@# -@#setdebug level=400 storage=File1 -restore bootstrap=@topdir@/tmp/bscan.bsr where=@topdir@/tmp/bacula-restores select all storage=File1 done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/bscan-test.cmd b/regress/win32/tests/bscan-test.cmd deleted file mode 100644 index 5b71db8c1a..0000000000 --- a/regress/win32/tests/bscan-test.cmd +++ /dev/null @@ -1,42 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory but -REM split the archive into two volumes then bscan it -REM into the catalog after the backup. It also to a limited -REM extent tests the purge volume and delete volume commands. -REM - -SET TestName=bscan-test -SET JobName=bscan - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\bscan-test.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File1 -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 -) ELSE ( - bin\bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf %CD:\=/%/tmp >nul 2>&1 -) - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\bscan-test.2.bscr >tmp\bconcmds - -REM now run restore -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File1 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/bsr-opt-test.bscr b/regress/win32/tests/bsr-opt-test.bscr deleted file mode 100644 index 1f0576b930..0000000000 --- a/regress/win32/tests/bsr-opt-test.bscr +++ /dev/null @@ -1,24 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=File1 volume=TestVolume001 -label storage=File1 volume=TestVolume002 -update Volume=TestVolume001 MaxVolBytes=3000000 -run job=@JobName@ storage=File1 yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore bootstrap=@topdir@/working/restore.bsr where=@topdir@/tmp/bacula-restores select storage=File1 -unmark * -cd @topdir@/build/src/cats -mark * -ls -done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/bsr-opt-test.cmd b/regress/win32/tests/bsr-opt-test.cmd deleted file mode 100644 index 9f816ab084..0000000000 --- a/regress/win32/tests/bsr-opt-test.cmd +++ /dev/null @@ -1,57 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory but -REM split the archive into two volumes, then restore -REM files on only one of the volumes and ensure that -REM the other volume is not used. I.e. bsr optimization -REM works. -REM -SET TestName=bsr-opt-test -SET JobName=bsr-opt - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\bsr-opt-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File1 -CALL scripts\functions stop_bacula -REM -REM This test is not really reliable. What we want to do is -REM to select files on only one Volume, then insure here -REM that only one Volume is chosen. -REM -grep TestVolume002 working\restore.bsr >nul 2>&1 -SET bsrstat=%ERRORLEVEL% -CALL scripts\functions check_two_logs - -diff -r build\src\cats tmp\bacula-restores\%CD::=%\build\src\cats >nul 2>&1 -SET /A errcount = %bsrstat% + %bstat% + %rstat% -IF %errcount% NEQ 0 ( - ECHO. - ECHO. - ECHO !!!!! bsr-opt-test Bacula source failed!!! !!!!! - ECHO !!!!! bsr-opt-test failed!!! !!!!! >>test.out - - SET /A errcount = %bstat% + %rstat% - IF %errcount% NEQ 0 ( - ECHO !!!!! Bad Job termination status !!!!! - ECHO !!!!! Bad Job termination status !!!!! >>test.out - ) ELSE IF %bsrstat% NEQ 0 ( - ECHO !!!!! Volume selection error !!!!! - ECHO !!!!! Volume selection error !!!!! >>test.out - ) ELSE ( - ECHO !!!!! Restored files differ !!!!! - ECHO !!!!! Restored files differ !!!!! >>test.out - ) - ECHO. -) ELSE ( - ECHO ===== bsr-opt-test Bacula source OK %TIME% ===== - ECHO ===== bsr-opt-test OK %TIME% ===== >>test.out - CALL scripts\cleanup -) diff --git a/regress/win32/tests/btape-fill-full-tape b/regress/win32/tests/btape-fill-full-tape deleted file mode 100644 index f4ba59fb5b..0000000000 --- a/regress/win32/tests/btape-fill-full-tape +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Test the fill command in btape -# -TestName="btape-fill-full-tape" -JobName=AutoLabel -. scripts/functions -set_debug 0 - -scripts/copy-tape-confs -scripts/cleanup-tape - -change_jobname $JobName -start_test - -bin/btape -c bin/bacula-sd.conf DDS-4 <&1 >tmp/log1.out -fill -s - -quit -END_OF_DATA - - -grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null -if [ $? != 0 ] ; then - echo " " - echo " " - echo " !!!!! btape fill test failed!!! !!!!! " - echo " !!!!! btape fill test failed!!! !!!!! " >>test.out - echo " " -else - echo " ===== btape fill test OK ===== " - echo " ===== btape fill test OK ===== " >>test.out -# scripts/cleanup -fi diff --git a/regress/win32/tests/btape-fill-tape b/regress/win32/tests/btape-fill-tape deleted file mode 100644 index b3fb4e5afd..0000000000 --- a/regress/win32/tests/btape-fill-tape +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# Test the fill command in btape -# -TestName="btape-fill-tape" -JobName=filltape -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# MaximumVolumeSize% MaximumVolumeSize%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -start_test - -cat <tmp/bconcmds -fill -s -quit -END_OF_DATA - -run_btape DDS-4 - -grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null -if [ $? != 0 ] ; then - echo " " - echo " " - echo " !!!!! btape fill test failed!!! !!!!! " - echo " !!!!! btape fill test failed!!! !!!!! " >>test.out - echo " " -else - echo " ===== btape fill test OK ===== " - echo " ===== btape fill test OK ===== " >>test.out -# scripts/cleanup -fi diff --git a/regress/win32/tests/compressed-test.bscr b/regress/win32/tests/compressed-test.bscr deleted file mode 100644 index d46459f878..0000000000 --- a/regress/win32/tests/compressed-test.bscr +++ /dev/null @@ -1,23 +0,0 @@ -@output -messages -@@out@ tmp/log1.out -status all -status all -messages -label storage=File volume=TestVolume001 -run job=@JobName@ storage=File yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/compressed-test.cmd b/regress/win32/tests/compressed-test.cmd deleted file mode 100644 index 2097c6124f..0000000000 --- a/regress/win32/tests/compressed-test.cmd +++ /dev/null @@ -1,24 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory using the compressed option -REM then restore it. -REM -SET TestName=compressed-test -SET JobName=compressed - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\compressed-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/concurrent-jobs-test.bscr b/regress/win32/tests/concurrent-jobs-test.bscr deleted file mode 100644 index 1799fd6e0b..0000000000 --- a/regress/win32/tests/concurrent-jobs-test.bscr +++ /dev/null @@ -1,23 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ level=Full yes -run job=@JobName@ level=Full yes -run job=@JobName@ level=Full yes -run job=@JobName@ level=Full yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/concurrent-jobs-test.cmd b/regress/win32/tests/concurrent-jobs-test.cmd deleted file mode 100644 index 9c36b48c7e..0000000000 --- a/regress/win32/tests/concurrent-jobs-test.cmd +++ /dev/null @@ -1,35 +0,0 @@ -REM -REM Run two jobs at the same time -REM - -SET TestName=concurrent-jobs-test -SET JobName=concurrent-jobs - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -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 - -ECHO largefile created - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\concurrent-jobs-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -diff tmp\largefile tmp\bacula-restores\%CD::=%\tmp\largefile >nul 2>&1 -SET dstat=%ERRORLEVEL% -CALL scripts\functions end_test diff --git a/regress/win32/tests/dev-test-root b/regress/win32/tests/dev-test-root deleted file mode 100644 index 26ae6fee84..0000000000 --- a/regress/win32/tests/dev-test-root +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -MUID=`/usr/bin/id -u` -if [ $MUID != 0 ] ; then - echo " " - echo "You must be root to run this test." - echo " ===== !!!! dev-test-root not run !!!! ===== " - echo " ===== !!!! dev-test-root not run !!!! ===== " >>test.out - echo " " - exit 1 -fi -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "/dev" >/tmp/file-list - -echo " " -echo " " -echo " === Starting dev-test-root test ===" -echo " " -echo " === Note, this test can fail for trivial ===" -echo " === reasons on non-Linux systems. ===" -echo " " -echo " " - -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test dev >${cwd}/tmp/original -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test dev >${cwd}/tmp/restored -cd ${cwd}/tmp -# -# Use sed to cut out parts that *always* change -# -cat >sed.scr <1 -sed -f sed.scr 1 | sort >original -# -mv -f restored 1 -sed -f sed.scr 1 | sort >restored -rm -f sed.scr -# -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/null -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== !!!! dev-test-root failed !!!! ===== " - echo " ===== !!!! dev-test-root failed !!!! ===== " >>test.out - echo " " -else - echo " ===== dev-test-root OK ===== " - echo " ===== dev-test-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/win32/tests/differential-test.1.bscr b/regress/win32/tests/differential-test.1.bscr deleted file mode 100644 index 5b23122bdc..0000000000 --- a/regress/win32/tests/differential-test.1.bscr +++ /dev/null @@ -1,9 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume002 -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/differential-test.2.bscr b/regress/win32/tests/differential-test.2.bscr deleted file mode 100644 index c8ddb49849..0000000000 --- a/regress/win32/tests/differential-test.2.bscr +++ /dev/null @@ -1,9 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -@# Force differential on the second Volume -update volume=TestVolume002 VolStatus=Used -run level=differential job=@JobName@ yes -wait -messages -@@out@ diff --git a/regress/win32/tests/differential-test.3.bscr b/regress/win32/tests/differential-test.3.bscr deleted file mode 100644 index 3d2b98e26b..0000000000 --- a/regress/win32/tests/differential-test.3.bscr +++ /dev/null @@ -1,16 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -run level=incremental job=@JobName@ yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores storage=File file=<@topdir@/tmp/restore-list -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/differential-test.cmd b/regress/win32/tests/differential-test.cmd deleted file mode 100644 index 6ffdff055c..0000000000 --- a/regress/win32/tests/differential-test.cmd +++ /dev/null @@ -1,48 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then create some -REM new files, do a differential and restore those two files. -REM -SET TestName=differential-test -SET JobName=differential - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -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 -ECHO %CD:\=/%/tmp/build/ficheriro2.txt>>tmp\restore-list - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\differential-test.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File - -ECHO ficheriro1.txt >tmp\build\ficheriro1.txt -ECHO ficheriro2.txt >tmp\build\ficheriro2.txt - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\differential-test.2.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole - -CALL scripts\functions check_for_zombie_jobs storage=File -ECHO ficheriro2.txt >tmp\build\ficheriro2.txt - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\differential-test.3.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -REM -REM Delete .c files because we will only restore the txt files -REM -DEL tmp\build\*.c -CALL scripts\functions check_restore_tmp_build_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/eot-fail-tape b/regress/win32/tests/eot-fail-tape deleted file mode 100644 index 4907e8dca6..0000000000 --- a/regress/win32/tests/eot-fail-tape +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to two tapes where the maximum tape file size is set to 1M -# -TestName="eot-fail-tape" -JobName=eotfailtape -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-tape-confs - -echo "${cwd}/build" >/tmp/file-list - -out="tmp/sed_tmp" -echo "s%# Maximum File Size% Maximum File Size%g" >${out} -cp -f ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -update Volume=TestVolume001 MaxVolBytes=3000000 -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@tee -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/etc-test-root b/regress/win32/tests/etc-test-root deleted file mode 100644 index e3a4495b88..0000000000 --- a/regress/win32/tests/etc-test-root +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -MUID=`/usr/bin/id -u` -if [ $MUID != 0 ] ; then - echo " " - echo "You must be root to run this test." - echo " ===== !!!! etc-test-root not run !!!! ===== " - echo " ===== !!!! etc-test-root not run !!!! ===== " >>test.out - echo " " - exit 1 -fi -echo " " -echo " " -echo " === Starting /etc save/restore test ===" -echo " " -echo " " -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "/etc" >/tmp/file-list - -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test etc >${cwd}/tmp/1 -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test etc >${cwd}/tmp/2 -sort <${cwd}/tmp/1 >${cwd}/tmp/original -sort <${cwd}/tmp/2 >${cwd}/tmp/restored -rm -f ${cwd}/tmp/1 ${cwd}/tmp/2 -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/null -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== !!!! etc-test-root failed !!!! ===== " - echo " ===== !!!! etc-test-root failed !!!! ===== " >>test.out - echo " " -else - echo " ===== etc-test-root OK ===== " - echo " ===== etc-test-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/win32/tests/fixed-block-size-tape b/regress/win32/tests/fixed-block-size-tape deleted file mode 100644 index 10de2c45e5..0000000000 --- a/regress/win32/tests/fixed-block-size-tape +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape where we set the minimum and maximum block -# sizes. -# -TestName="fixed-block-size-tape" -JobName=fixedblocksize -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -echo "s%# Maximum Block Size% Maximum Block Size%" >${cwd}/tmp/2 -echo "s%# Minimum Block Size% Minimum Block Size%" >>${cwd}/tmp/2 -sed -f ${cwd}/tmp/2 ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf -if [ $? != 0 ] ; then - echo " " - echo " " - echo "!!!! sed problem in Fixed Block Size test !!!!!" - echo " " - exit 1 -fi -rm -f ${cwd}/tmp/1 ${cwd}/tmp/2 - -change_jobname NightlySave $JobName -start_test - - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/four-concurrent-jobs-tape b/regress/win32/tests/four-concurrent-jobs-tape deleted file mode 100644 index 0d0918f62b..0000000000 --- a/regress/win32/tests/four-concurrent-jobs-tape +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Run four jobs at the same time -# -TestName="four-concurrent-jobs-tape" -JobName=FourConcurrentJobs -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-tape-confs - -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -run job=$JobName level=Full Storage=DDS-4 yes -@sleep 2 -status dir -@sleep 5 -status dir -status storage=DDS-4 -messages -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/four-concurrent-jobs-test.bscr b/regress/win32/tests/four-concurrent-jobs-test.bscr deleted file mode 100644 index cdae631049..0000000000 --- a/regress/win32/tests/four-concurrent-jobs-test.bscr +++ /dev/null @@ -1,50 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File1 -TestVolume001 -label storage=File1 -TestVolume002 -update Volume=TestVolume001 MaxVolBytes=100000000 -@#50000000 -@#12 -run job=@JobName@ level=Full Storage=File1 -yes -reload -run job=@JobName@ level=Full Storage=File1 -yes -reload -run job=@JobName@ level=Full Storage=File1 -yes -reload -run job=@JobName@ level=Full Storage=File1 -yes -reload -reload -reload -reload -@sleep 2 -status dir -reload -@sleep 5 -messages -reload -reload -wait -reload -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File1 -unmark * -mark * -done -yes -wait -reload -reload -messages -@output -quit diff --git a/regress/win32/tests/four-concurrent-jobs-test.cmd b/regress/win32/tests/four-concurrent-jobs-test.cmd deleted file mode 100644 index 0530baa8f0..0000000000 --- a/regress/win32/tests/four-concurrent-jobs-test.cmd +++ /dev/null @@ -1,23 +0,0 @@ -REM -REM Run two jobs at the same time -REM -SET TestName=four-concurrent-jobs-test -SET JobName=Four-concurrent-jobs - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\four-concurrent-jobs-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File1 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/four-jobs-tape b/regress/win32/tests/four-jobs-tape deleted file mode 100644 index 4252ba2d7e..0000000000 --- a/regress/win32/tests/four-jobs-tape +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then finally restore. -# It should require at least 4 different bsrs. -# -TestName="four-jobs-tape" -JobName=fourjobstape -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -estimate job=$JobName listing -estimate job=$JobName listing -estimate job=$JobName listing -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -messages -quit -END_OF_DATA -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi - -scripts/check_for_zombie_jobs storage=DDS-4 -echo "Backup 1 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o - -# -# run a second job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi - -scripts/check_for_zombie_jobs storage=DDS-4 -echo "Backup 2 done" -touch ${cwd}/build/src/dird/*.c -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -# -# run a third job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi - -scripts/check_for_zombie_jobs storage=DDS-4 -echo "Backup 3 done" -# make some files for the incremental to pick up -touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o -# -# run a fourth job -# -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Incremental yes -wait -messages -quit -END_OF_DATA -if test "$debug" -eq 1 ; then - bin/bacula start - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf -else - bin/bacula start 2>&1 >/dev/null - cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf 2>&1 >/dev/null -fi - -scripts/check_for_zombie_jobs storage=DDS-4 -echo "Backup 4 done" -# -# now do several restores to ensure we cleanup between jobs -# -cat <tmp/bconcmds -@$out /dev/null -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -@$out tmp/log2.out -@# -@# now unmount the tape and start two restores -@# at the same time -@# -unmount storage=DDS-4 -restore where=${cwd}/tmp/bacula-restores select all done -yes -restore where=${cwd}/tmp/bacula-restores select -unmark * -mark * -done -yes -mount storage=DDS-4 -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/four-jobs-test.1.bscr b/regress/win32/tests/four-jobs-test.1.bscr deleted file mode 100644 index 462c2545f8..0000000000 --- a/regress/win32/tests/four-jobs-test.1.bscr +++ /dev/null @@ -1,11 +0,0 @@ -@output nul -estimate job=@JobName@ listing -estimate job=@JobName@ listing -estimate job=@JobName@ listing -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/four-jobs-test.2.bscr b/regress/win32/tests/four-jobs-test.2.bscr deleted file mode 100644 index 02fdc49786..0000000000 --- a/regress/win32/tests/four-jobs-test.2.bscr +++ /dev/null @@ -1,8 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -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 deleted file mode 100644 index 6da93295f1..0000000000 --- a/regress/win32/tests/four-jobs-test.3.bscr +++ /dev/null @@ -1,8 +0,0 @@ -@output nul -messages -@output tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/four-jobs-test.4.bscr b/regress/win32/tests/four-jobs-test.4.bscr deleted file mode 100644 index 6da93295f1..0000000000 --- a/regress/win32/tests/four-jobs-test.4.bscr +++ /dev/null @@ -1,8 +0,0 @@ -@output nul -messages -@output tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/four-jobs-test.5.bscr b/regress/win32/tests/four-jobs-test.5.bscr deleted file mode 100644 index 30bf4a7053..0000000000 --- a/regress/win32/tests/four-jobs-test.5.bscr +++ /dev/null @@ -1,17 +0,0 @@ -@output nul -restore where=@topdir@/tmp/bacula-restores select all storage=File done -yes -wait -restore where=@topdir@/tmp/bacula-restores select all storage=File done -yes -wait -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/four-jobs-test.cmd b/regress/win32/tests/four-jobs-test.cmd deleted file mode 100644 index 7978a7e2ed..0000000000 --- a/regress/win32/tests/four-jobs-test.cmd +++ /dev/null @@ -1,74 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory using the compressed option -REM then backup four times, each with incremental then finally restore. -REM It should require at least 4 different bsrs. -REM -SET TestName=four-jobs-test -SET JobName=SpanVol - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >/tmp/file-list - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\four-jobs-test.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -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 - -REM -REM run a second job -REM -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\four-jobs-test.2.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -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 - -REM -REM run a third job -REM -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\four-jobs-test.3.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -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 - -REM -REM run a fourth job -REM -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\four-jobs-test.4.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -CALL scripts\functions check_for_zombie_jobs storage=File - -ECHO Backup 4 done -REM -REM now do several restores to ensure we cleanup between jobs -REM -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\four-jobs-test.5.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/hardlink-test b/regress/win32/tests/hardlink-test deleted file mode 100644 index 42e38bcdde..0000000000 --- a/regress/win32/tests/hardlink-test +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -TestName="hardlink-test" -JobName=hardlink -. scripts/functions -set_debug 0 - -if test ! -d weird-files ; then - echo " " - echo "Weird files not configured. Test not run." - exit 0 -fi - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -change_jobname NightlySave $JobName -# -# Note, we save the weird-files directory twice on purpose -# because this causes problems with hard linked files -# that are only saved once. In 1.33, Bacula now deals -# with this situation. -# -echo "${cwd}/weird-files" >/tmp/file-list -echo "${cwd}/weird-files" >>/tmp/file-list - -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File -TestVolume001 -run job=$JobName -yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=File -5 -cd ${cwd}/weird-files/subdir -mark another-hardlink -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -check_two_logs -diff ${cwd}/weird-files/subdir/another-hardlink \ - ${cwd}/tmp/bacula-restores/${cwd}/weird-files/subdir/another-hardlink 2>&1 >/dev/null -dstat=$? -end_test diff --git a/regress/win32/tests/incremental-2disk.1.bscr b/regress/win32/tests/incremental-2disk.1.bscr deleted file mode 100644 index fdbc4a7615..0000000000 --- a/regress/win32/tests/incremental-2disk.1.bscr +++ /dev/null @@ -1,9 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0 -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/incremental-2disk.2.bscr b/regress/win32/tests/incremental-2disk.2.bscr deleted file mode 100644 index 76032d1a1d..0000000000 --- a/regress/win32/tests/incremental-2disk.2.bscr +++ /dev/null @@ -1,21 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -@# Force Incremental on the second Volume -update volume=TestVolume001 VolStatus=Used -run level=Incremental job=@JobName@ yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores -7 -<@topdir@/tmp/restore-list - -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/incremental-2disk.cmd b/regress/win32/tests/incremental-2disk.cmd deleted file mode 100644 index a51fc8ad05..0000000000 --- a/regress/win32/tests/incremental-2disk.cmd +++ /dev/null @@ -1,55 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then create some -REM new files, do an Incremental and restore those two files. -REM -REM This script uses the virtual disk autochanger -REM -SET TestName=incremental-2disk -SET JobName=Inc2disk - -CALL scripts\functions set_debug 0 - -CALL config_out - -CALL scripts\functions stop_bacula - -CALL bin\drop_bacula_tables >nul 2>&1 -CALL bin\make_bacula_tables >nul 2>&1 -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 -IF NOT EXIST tmp\build MKDIR tmp\build - -COPY build\src\dird\*.c tmp\build >nul 2>&1 -ECHO %CD:\=/%/tmp/build/ficheriro1.txt>tmp\restore-list -ECHO %CD:\=/%/tmp/build/ficheriro2.txt>>tmp\restore-list - -CALL scripts\functions change_jobname %JobName% -CALL scripts\functions start_test - -REM Write out bconsole commands -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-2disk.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula - -ECHO ficheriro1.txt >tmp\build\ficheriro1.txt -ECHO ficheriro2.txt >tmp\build\ficheriro2.txt - - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-2disk.2.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole - -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula -REM -REM Delete .c files because we will only restored the txt files -REM -DEL tmp\build\*.c - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_tmp_build_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/incremental-2tape.1.bscr b/regress/win32/tests/incremental-2tape.1.bscr deleted file mode 100644 index b5fa189e47..0000000000 --- a/regress/win32/tests/incremental-2tape.1.bscr +++ /dev/null @@ -1,9 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=0 -run job=NightlySave yes -wait -messages -quit diff --git a/regress/win32/tests/incremental-2tape.2.bscr b/regress/win32/tests/incremental-2tape.2.bscr deleted file mode 100644 index f57357f747..0000000000 --- a/regress/win32/tests/incremental-2tape.2.bscr +++ /dev/null @@ -1,21 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -@# Force Incremental on the second Volume -update volume=TestVolume001 VolStatus=Used -run level=Incremental job=NightlySave yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores -7 -<@topdir@/tmp/restore-list - -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/incremental-2tape.cmd b/regress/win32/tests/incremental-2tape.cmd deleted file mode 100644 index 2a646a0edd..0000000000 --- a/regress/win32/tests/incremental-2tape.cmd +++ /dev/null @@ -1,48 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then create some -REM new files, do an Incremental and restore those two files. -REM -REM This script uses the autochanger and two tapes -REM -SET TestName=incremental-2tape -SET JobName=inctwotape -CALL scripts\functions set_debug 0 - -CALL config_out -IF "%AUTOCHANGER%" == "nul" ( - ECHO incremental-2tape test skipped. No autochanger. - EXIT -) - -CALL scripts\functions stop_bacula -CALL drop_bacula_tables >nul 2>&1 -CALL make_bacula_tables >nul 2>&1 -CALL grant_bacula_privileges >nul 2>&1 - -CALL scripts\copy-2tape-confs -CALL scripts\cleanup-2tape -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 -ECHO %CD:\=/%/tmp/build/ficheriro2.txt>>tmp\restore-list - -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-2tape.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula - -ECHO ficheriro1.txt >tmp\build\ficheriro1.txt -ECHO ficheriro2.txt >tmp\build\ficheriro2.txt - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-2tape.2.bscr >tmp\bconcmds -CALL scripts\functions run_bconsole -CALL scripts\bacula stop_bacula -CALL scripts\bacula check_two_logs -REM -REM Delete .c files because we will only restore the txt files -REM -DEL tmp\build\*.c -CALL scripts\bacula check_restore_tmp_build_diff -CALL scripts\bacula end_test diff --git a/regress/win32/tests/incremental-tape b/regress/win32/tests/incremental-tape deleted file mode 100644 index 3b7264da77..0000000000 --- a/regress/win32/tests/incremental-tape +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory then create some -# new files, do an Incremental and restore those two files. -# -TestName="incremental-tape" -JobName=IncTape -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/tmp/build" >/tmp/file-list -if test ! -d ${cwd}/tmp/build ; then - mkdir ${cwd}/tmp/build -fi -cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build -cd ${cwd}/tmp -echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list -echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list -cd ${cwd} - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 - -echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt -echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run level=Incremental job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 -7 -<${cwd}/tmp/restore-list - -yes -wait -messages -@output -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -# -# Delete .c files because we will only restored the txt files -# -rm -f tmp/build/*.c - -check_two_logs -check_restore_tmp_build_diff -end_test diff --git a/regress/win32/tests/incremental-test.1.bscr b/regress/win32/tests/incremental-test.1.bscr deleted file mode 100644 index 9ab38bffe0..0000000000 --- a/regress/win32/tests/incremental-test.1.bscr +++ /dev/null @@ -1,9 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -label storage=File volume=TestVolume002 -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/incremental-test.2.bscr b/regress/win32/tests/incremental-test.2.bscr deleted file mode 100644 index f716a022c8..0000000000 --- a/regress/win32/tests/incremental-test.2.bscr +++ /dev/null @@ -1,9 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -@# Force Incremental on the second Volume -update volume=TestVolume001 VolStatus=Used -run level=Differential job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/incremental-test.3.bscr b/regress/win32/tests/incremental-test.3.bscr deleted file mode 100644 index c4239dd0a3..0000000000 --- a/regress/win32/tests/incremental-test.3.bscr +++ /dev/null @@ -1,7 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -run level=Incremental job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/incremental-test.4.bscr b/regress/win32/tests/incremental-test.4.bscr deleted file mode 100644 index 700afcb8d4..0000000000 --- a/regress/win32/tests/incremental-test.4.bscr +++ /dev/null @@ -1,7 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -run level=Differential job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/incremental-test.5.bscr b/regress/win32/tests/incremental-test.5.bscr deleted file mode 100644 index 1f093f18ef..0000000000 --- a/regress/win32/tests/incremental-test.5.bscr +++ /dev/null @@ -1,16 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -run level=Incremental job=@JobName@ yes -wait -messages -@# -@# now do a restore -@# -@output tmp/log2.out -restore where=@topdir@/tmp/bacula-restores storage=File file=<@topdir@/tmp/restore-list -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/incremental-test.cmd b/regress/win32/tests/incremental-test.cmd deleted file mode 100644 index 3bc0ac92f9..0000000000 --- a/regress/win32/tests/incremental-test.cmd +++ /dev/null @@ -1,91 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then create some -REM new files, do an Incremental and restore those two files. -REM -SET TestName=incremental-test -SET JobName=Incremental - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -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 -ECHO %CD:\=/%/tmp/build/ficheriro2.txt>>tmp\restore-list - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-test.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -REM -REM Now create two new files to be restored later -REM -bin\bsleep 1 -ECHO ficheriro1.txt >tmp\build\ficheriro1.txt -COPY tmp\build\dird.c tmp\build\ficheriro2.txt >nul 2>&1 - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-test.2.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole - -bin\bsleep 1 -touch tmp\build\ficheriro1.txt -touch tmp\build\ficheriro2.txt - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-test.3.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole - -bin\bsleep 1 - -COPY tmp\build\ficheriro2.txt tmp\build\1 >nul 2>&1 -sed -e "s;a;b;g" tmp\build\1 >tmp\build\ficheriro2.txt -DEL tmp\build\1 - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-test.4.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole - -bin\bsleep 1 -touch tmp\build\ficheriro1.txt -touch tmp\build\ficheriro2.txt -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-test.3.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole - -bin\bsleep 1 -touch tmp\build\ficheriro1.txt -touch tmp\build\ficheriro2.txt -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-test.3.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole - -bin\bsleep 1 -touch tmp\build\ficheriro1.txt -touch tmp\build\ficheriro2.txt -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-test.3.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -bin\bsleep 1 -touch tmp\build\ficheriro1.txt -touch tmp\build\ficheriro2.txt - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\incremental-test.5.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -REM -REM Delete .c files because we will only restored the txt files -REM -DEL tmp\build\*.c -CALL scripts\functions check_restore_tmp_build_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/lib-tape-root b/regress/win32/tests/lib-tape-root deleted file mode 100644 index 06289cd1d4..0000000000 --- a/regress/win32/tests/lib-tape-root +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the /lib directory -# then restore it. -# -cwd=`pwd` -bin/bacula stop 2>&1 >/dev/null -cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null -cd .. - -scripts/cleanup-tape -scripts/copy-tape-confs -echo "/lib" >/tmp/file-list -echo " " -echo " " -echo " === Starting lib-tape-root test ===" -echo " " -echo " " -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/original -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/restored -cd ${cwd}/tmp -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% original >1 -sort <1 >original -# -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% restored >1 -sort <1 >restored -rm -f 1 -# -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/nul -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== lib-tape-root failed!!! ===== " - echo " ===== lib-tape-root failed!!! ===== " >>test.out - echo " " -else - echo " ===== lib-tape-root OK ===== " - echo " ===== lib-tape-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/win32/tests/lib-test-root b/regress/win32/tests/lib-test-root deleted file mode 100644 index 4f41954a29..0000000000 --- a/regress/win32/tests/lib-test-root +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -MUID=`/usr/bin/id -u` -if [ $MUID != 0 ] ; then - echo " " - echo "You must be root to run this test." - echo " ===== !!!! lib-test-root not run !!!! ===== " - echo " ===== !!!! lib-test-root not run !!!! ===== " >>test.out - echo " " - exit 1 -fi -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -echo "/lib" >/tmp/file-list - -echo " " -echo " " -echo " === Starting /lib save/restore test ===" -echo " " -echo " " - -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-lib-test lib >${cwd}/tmp/original -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-lib-test lib >${cwd}/tmp/restored -cd ${cwd}/tmp -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% original >1 -sort <1 >original -# -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% restored >1 -sort <1 >restored -rm -f 1 -# -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/nul -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== !!!! lib-test-root failed !!!! ===== " - echo " ===== !!!! lib-test-root failed !!!! ===== " >>test.out - echo " " -else - echo " ===== lib-test-root OK ===== " - echo " ===== lib-test-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/win32/tests/migration-job-test.cmd b/regress/win32/tests/migration-job-test.cmd deleted file mode 100644 index d851fdeea6..0000000000 --- a/regress/win32/tests/migration-job-test.cmd +++ /dev/null @@ -1,37 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then migrate it -REM to another device. -REM -REM This script uses the virtual disk autochanger -REM -SET TestName=migration-job-test -SET JobName=MigrationJobSave - -CALL scripts\functions set_debug 0 - -CALL config_out - -CALL scripts\cleanup -CALL scripts\copy-migration-confs -CALL scripts\prepare-two-disks -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -REM -REM Note, we first backup into Pool Default, -REM then Migrate into Pool Full. -REM Pool Default uses Storage=File -REM Pool Full uses Storage=DiskChanger - -REM Write out bconsole commands -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\migration-job-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/migration-jobspan-test.cmd b/regress/win32/tests/migration-jobspan-test.cmd deleted file mode 100644 index e21a19aaf2..0000000000 --- a/regress/win32/tests/migration-jobspan-test.cmd +++ /dev/null @@ -1,42 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then migrate it -REM to another device. -REM -REM Test migrating a job that spans two Volumes -REM -REM This script uses the virtual disk autochanger -REM -SET TestName=migration-jobspan-test -SET JobName=MigrationJobSpanSave - -CALL scripts\functions set_debug 0 - -CALL config_out - -CALL scripts\cleanup -CALL scripts\copy-migration-confs -CALL scripts\prepare-two-disks - -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 - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -REM -REM Note, we first backup into Pool Default, -REM then Migrate into Pool Full. -REM Pool Default uses Storage=File -REM Pool Full uses Storage=DiskChanger - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\migration-jobspan-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/migration-occupancy-test.cmd b/regress/win32/tests/migration-occupancy-test.cmd deleted file mode 100644 index d68dac563d..0000000000 --- a/regress/win32/tests/migration-occupancy-test.cmd +++ /dev/null @@ -1,36 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then migrate it -REM to another device. -REM -REM This script uses the virtual disk autochanger -REM -SET TestName=migration-occupancy-test -SET JobName=MigrationJobSave - -CALL scripts\functions set_debug 0 - -CALL config_out - -CALL scripts\cleanup -CALL scripts\copy-migration-confs -CALL scripts\prepare-two-disks -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -REM -REM Note, we first backup into Pool Default, -REM then Migrate into Pool Full. -REM Pool Default uses Storage=File -REM Pool Full uses Storage=DiskChanger - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\migration-occupancy-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/migration-time-test.cmd b/regress/win32/tests/migration-time-test.cmd deleted file mode 100644 index 473ebe6b5e..0000000000 --- a/regress/win32/tests/migration-time-test.cmd +++ /dev/null @@ -1,37 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then migrate it -REM to another device. -REM -REM This script uses the virtual disk autochanger -REM -SET TestName=migration-time-test -SET JobName=MigrationJobSave - -CALL scripts\functions set_debug 0 - -CALL config_out - -CALL scripts\cleanup -CALL scripts\copy-migration-confs -CALL scripts\prepare-two-disks - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -REM -REM Note, we first backup into Pool Default, -REM then Migrate into Pool Full. -REM Pool Default uses Storage=File -REM Pool Full uses Storage=DiskChanger - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\migration-time-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/migration-volume-test.cmd b/regress/win32/tests/migration-volume-test.cmd deleted file mode 100644 index 86505d46a6..0000000000 --- a/regress/win32/tests/migration-volume-test.cmd +++ /dev/null @@ -1,40 +0,0 @@ -REM -REM Run a backup of the Bacula build directory on two Volumes -REM then migrate it to another device. -REM -REM This script uses the virtual disk autochanger -REM -SET TestName=migration-volume-test -SET JobName=MigVolBackup - -CALL scripts\functions set_debug 0 - -CALL config_out - -CALL scripts\cleanup -CALL scripts\copy-migration-confs -CALL scripts\prepare-two-disks - -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 - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -REM -REM Note, we first backup into Pool Default, -REM then Migrate into Pool Full. -REM Pool Default uses Storage=File -REM Pool Full uses Storage=DiskChanger - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\migration-volume-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/query-test.1.bscr b/regress/win32/tests/query-test.1.bscr deleted file mode 100644 index 9ab38bffe0..0000000000 --- a/regress/win32/tests/query-test.1.bscr +++ /dev/null @@ -1,9 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -label storage=File volume=TestVolume002 -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/query-test.2.bscr b/regress/win32/tests/query-test.2.bscr deleted file mode 100644 index 9e1afb7dfb..0000000000 --- a/regress/win32/tests/query-test.2.bscr +++ /dev/null @@ -1,9 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -@# Force differental on the second Volume -update volume=TestVolume001 VolStatus=Used -run level=differental job=@JobName@ yes -wait -messages -@output diff --git a/regress/win32/tests/query-test.3.bscr b/regress/win32/tests/query-test.3.bscr deleted file mode 100644 index 266f6a4ff7..0000000000 --- a/regress/win32/tests/query-test.3.bscr +++ /dev/null @@ -1,46 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -run level=incremental job=@JobName@ yes -wait -messages -@# -@# Now do the queries -@# -query -1 -ficheriro1.txt -query -2 -@topdir@/tmp/build/ -ficheriro1.txt -localhost-fd -query -6 -TestVolume001 -query -7 -1 -query -8 -localhost-fd -query -9 -Default -query -10 -query -11 -query -12 -1 -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores storage=File file=<@topdir@/tmp/restore-list -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/query-test.cmd b/regress/win32/tests/query-test.cmd deleted file mode 100644 index d919bbea87..0000000000 --- a/regress/win32/tests/query-test.cmd +++ /dev/null @@ -1,48 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory then create some -REM new files, do a Differental then a bunch of query commands -REM and finally restore the two files. -REM -SET TestName=query-test -SET JobName=query - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -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 -ECHO %CD:\=/%/tmp/build/ficheriro2.txt>>tmp\restore-list - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\query-test.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File - -ECHO ficheriro1.txt >tmp\build\ficheriro1.txt -ECHO ficheriro2.txt >tmp\build\ficheriro2.txt - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\query-test.2.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File - -ECHO ficheriro2.txt >tmp\build\ficheriro2.txt -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\query-test.3.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -REM -REM Delete .c files because we will only restored the txt files -REM -DEL tmp\build\*.c - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_tmp_build_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/recycle-test.bscr b/regress/win32/tests/recycle-test.bscr deleted file mode 100644 index 734cc7e9d3..0000000000 --- a/regress/win32/tests/recycle-test.bscr +++ /dev/null @@ -1,51 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File1 volume=TestVolume001 -label storage=File1 volume=TestVolume002 -label storage=File1 volume=TestVolume003 -update Volume=TestVolume001 volretention=10s -update Volume=TestVolume001 maxvoljobs=1 -update Volume=TestVolume002 volretention=10s -update Volume=TestVolume002 maxvoljobs=1 -update Volume=TestVolume003 volretention=10s -update Volume=TestVolume003 maxvoljobs=1 -list volumes -run job=@JobName@ storage=File1 level=full yes -wait -messages -list volumes -run job=@JobName@ storage=File1 level=full yes -wait -messages -list volumes -run job=@JobName@ storage=File1 level=full yes -wait -messages -list volumes -@sleep 10 -run job=@JobName@ storage=File1 level=full yes -wait -messages -list volumes -run job=@JobName@ storage=File1 level=full yes -wait -messages -list volumes -run job=@JobName@ storage=File1 level=full yes -wait -messages -list volumes -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File1 -unmark * -mark * -done -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/recycle-test.cmd b/regress/win32/tests/recycle-test.cmd deleted file mode 100644 index b006fe482f..0000000000 --- a/regress/win32/tests/recycle-test.cmd +++ /dev/null @@ -1,26 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory but -REM create three volumes and do six backups causing the -REM volumes to be recycled, and cycling through the volumes -REM twice. Tests maxvoljobs and volretention. -REM -SET TestName=recycle-test -SET JobName=Recycle - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\recycle-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File1 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/relabel-tape b/regress/win32/tests/relabel-tape deleted file mode 100644 index 2a1ce858c7..0000000000 --- a/regress/win32/tests/relabel-tape +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory using the compressed option -# then backup four times, each with incremental then finally restore. -# It should require at least 4 different bsrs. -# -TestName="relabel-tape" -JobName=Relabeltape -. scripts/functions -set_debug 0 - -scripts/cleanup-tape -scripts/copy-tape-confs -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName level=Full yes -wait -messages -add pool=Default -0 -TestVolume002 -@# set status to append -update volume=TestVolume001 -1 -. -run job=NightlySave level=Full yes -@sleep 20 -unmount -unmount -purge volume=TestVolume001 -relabel oldvolume=TestVolume001 volume=TestVolume003 slot=0 pool=Default -list volumes -mount -messages -wait -run job=$JobName level=Full yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 - - -echo "Backup done" -# -# now do several restores to ensure we cleanup between jobs -# -cat <tmp/bconcmds -@$out /dev/null -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -restore where=${cwd}/tmp/bacula-restores select all done -yes -wait -@$out tmp/log2.out -@# -@# now unmount the tape and start two restores -@# at the same time -@# -unmount storage=DDS-4 -restore where=${cwd}/tmp/bacula-restores select all done -yes -restore where=${cwd}/tmp/bacula-restores select -unmark * -mark * -done -yes -mount storage=DDS-4 -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole - -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/restore-by-file-tape b/regress/win32/tests/restore-by-file-tape deleted file mode 100644 index 98827959f5..0000000000 --- a/regress/win32/tests/restore-by-file-tape +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape where the maximum tape file size is set to 1M -# then restore a few files from it. Note, by setting the maximum -# file size to 1M, it runs very slow. There are about 64 files that -# are created during each of the two backups. -# -TestName="restore-by-file-tape" -JobName=restorebyfile -. scripts/functions -set_debug 0 -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list -sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list - -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -run job=$JobName level=Full yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 file=<${cwd}/tmp/restore2-list -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -dstat=0 -# -# We need to stop and start Bacula to -# test appending to a previously written tape -# -for i in `cat ${cwd}/tmp/restore2-list`; do - diff $i ${cwd}/tmp/bacula-restores$i - if [ $? != 0 ] ; then - dstat=1 - fi -done - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -run job=$JobName level=Full yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores -7 -<${cwd}/tmp/restore2-list - -yes -wait -messages -@output -quit -END_OF_DATA - -# -# Bacula was stopped, but we must restart it to -# test appending to a previously written tape -# -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs - -scripts/check_for_zombie_jobs storage=DDS-4 -bin/bacula stop 2>&1 >/dev/null -for i in `cat ${cwd}/tmp/restore2-list`; do - diff $i ${cwd}/tmp/bacula-restores$i - if [ $? != 0 ] ; then - dstat=1 - fi -done - -end_test diff --git a/regress/win32/tests/restore-by-file-test.bscr b/regress/win32/tests/restore-by-file-test.bscr deleted file mode 100644 index ad4053aed4..0000000000 --- a/regress/win32/tests/restore-by-file-test.bscr +++ /dev/null @@ -1,20 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores storage=File -7 -<@topdir@/tmp/restore-list - -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/restore-by-file-test.cmd b/regress/win32/tests/restore-by-file-test.cmd deleted file mode 100644 index 669196648a..0000000000 --- a/regress/win32/tests/restore-by-file-test.cmd +++ /dev/null @@ -1,30 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory using the compressed option -REM then restore it. -REM - -SET TestName=restore-by-file-test -SET JobName=restorebyfile - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -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 -sed -e "s;^;%CD:\=/%/tmp/build/;" tmp\1 >tmp\restore-list -DEL tmp\1 - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\restore-by-file-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_tmp_build_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/restore-disk-seek-test.bscr b/regress/win32/tests/restore-disk-seek-test.bscr deleted file mode 100644 index a6f4ef68a6..0000000000 --- a/regress/win32/tests/restore-disk-seek-test.bscr +++ /dev/null @@ -1,23 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -sql -select * from JobMedia; - -restore bootstrap=@topdir@/tmp/rbn.bsr where=@topdir@/tmp/bacula-restores storage=File -7 -<@topdir@/tmp/restore-list - -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/restore-disk-seek-test.cmd b/regress/win32/tests/restore-disk-seek-test.cmd deleted file mode 100644 index 6fdfdbd60f..0000000000 --- a/regress/win32/tests/restore-disk-seek-test.cmd +++ /dev/null @@ -1,55 +0,0 @@ -REM -REM Run a backup of the full bacula build directory, but with the -REM Maximum File Size set. Then do a restore of a few files to kick in -REM disk seeking (not yet enabled), and ensure that the restored files -REM match. Even though disk seeking is not yet enabled, this is a good test, -REM and once it is enabled, this will test it. -REM -SET TestName=restore-disk-seek-test -SET JobName=restore-disk-seek - -CALL scripts\functions set_debug 1 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/tmp/build >\tmp\file-list - -IF EXIST tmp\build RD /s /q tmp\build -MKDIR tmp\build - -REM Copy only the .c files (to be restored) -REM set files to "*.c" for all c files -SET files=ua_tree.c ua_update.c -REM SET files=*.c -FOR %%i in ( %files% ) DO COPY build\src\dird\%%i tmp\build >nul 2>&1 -DIR /b tmp\build >tmp\1 -sed -e "s;^;%CD:\=/%/tmp/build/;" tmp\1 >tmp\restore-list - -REM At this point restore-list contains the list -REM of files we will restore -DEL tmp\1 - -REM Now backup *everything* -IF EXIST tmp\build RD /s /q tmp\build -MKDIR tmp\build -COPY build\src\dird\* tmp\build >nul 2>&1 -REM Enable MaximumFileSize -COPY bin\bacula-sd.conf tmp\1 >nul 2>&1 -sed "s;# Maximum File Size; Maximum File Size;" tmp\1 >bin\bacula-sd.conf - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\restore-disk-seek-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -REM Now setup a control directory of only what we *should* restore -RD /s /q tmp\build -MKDIR tmp\build -FOR %%i in ( %files% ) DO COPY build\src\dird\%%i tmp\build >nul 2>&1 - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_tmp_build_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/restore2-by-file-test.bscr b/regress/win32/tests/restore2-by-file-test.bscr deleted file mode 100644 index 12d2d8fd4b..0000000000 --- a/regress/win32/tests/restore2-by-file-test.bscr +++ /dev/null @@ -1,17 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores storage=File file=<@topdir@/tmp/restore2-list -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/restore2-by-file-test.cmd b/regress/win32/tests/restore2-by-file-test.cmd deleted file mode 100644 index cba7ea35b1..0000000000 --- a/regress/win32/tests/restore2-by-file-test.cmd +++ /dev/null @@ -1,31 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory using the compressed option -REM then restore a few selected files. -REM -SETLOCAL ENABLEDELAYEDEXPANSION -SET TestName=restore2-by-file-test -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 - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\restore2-by-file-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -SET dstat=0 -FOR /f %%i IN ( tmp\restore2-list ) DO ( - SET SUBDIR=%%i - diff %%i tmp/bacula-restores/!SUBDIR::=! - IF %ERRORLEVEL% NEQ 0 SET dstat=1 -) -CALL scripts\functions end_test diff --git a/regress/win32/tests/runscript-test b/regress/win32/tests/runscript-test deleted file mode 100644 index 77212621fc..0000000000 --- a/regress/win32/tests/runscript-test +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -# Test if Bacula can automatically create a Volume label. -# - -TestName="runscript-test" - -. scripts/functions -set_debug 0 -copy_test_confs - -rm -f bin/bacula-dir.conf -/bin/cp -f scripts/bacula-dir.conf.testrunscript bin/bacula-dir.conf - -echo "${cwd}/build" >/tmp/file-list - -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -label volume=TestVolume001 -@#setdebug level=100 storage=File -@output tmp/log.RUN2.out -run job=RUN_FD_WARNING yes -wait -@sleep 5 -messages -run job=RUN_ALL_OK yes -wait -@sleep 5 -messages -run job=RUN_FD_FAILED yes -wait -@sleep 5 -messages -run job=RUN_DIR_FAILED yes -wait -@sleep 5 -messages -st dir -quit -END_OF_DATA - - -bin/bacula start -cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf &> tmp/log.RUN1.out - -stop_bacula - -if grep -q 'dir: BeforeJob: run command "/bin/echo RunBeforeJob"' tmp/log.RUN1.out && - grep -q 'fd: ClientRunBeforeJob: ClientRunBeforeJob' tmp/log.RUN1.out && - grep -q 'fd: ClientAfterJob: run command "/bin/echo ClientRunAfterJob' tmp/log.RUN1.out && - grep -q 'dir: AfterJob: run command "/bin/echo RunAfterJob' tmp/log.RUN1.out -then - [ "$debug" -eq 1 ] && echo RUN_ALL_OK ok -else - echo "RUN_ALL_OK in error" - rstat=1 -fi - -if grep -q 'dir: BeforeJob: run command "/bin/false RUN_DIR_FAILED"' tmp/log.RUN1.out && - grep -q 'dir: BeforeJob: RunAfterFailedJob' tmp/log.RUN1.out && - true # grep -q 'Backup OK -- with warnings' tmp/log.RUN1.out -then - [ "$debug" -eq 1 ] && echo RUN_DIR_FAILED ok -else - echo "RUN_DIR_FAILED in error" - rstat=1 -fi - -if grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED1"' tmp/log.RUN1.out && - grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_FAILED2"' tmp/log.RUN1.out && - grep -q 'dir: AfterJob: run command "/bin/echo RunAfterFailedJob"' tmp/log.RUN1.out -then - [ "$debug" -eq 1 ] && echo RUN_FD_FAILED ok -else - echo "RUN_FD_FAILED in error" - rstat=1 -fi - -if grep -q 'fd: ClientBeforeJob: run command "/bin/false RUN_FD_WARNING"' tmp/log.RUN1.out && - grep -q 'Backup OK -- with warnings' tmp/log.RUN1.out -then - [ "$debug" -eq 1 ] && echo RUN_FD_WARNING ok -else - echo "RUN_FD_WARNING in error" - rstat=1 -fi - diff --git a/regress/win32/tests/scratch-pool-test.bscr b/regress/win32/tests/scratch-pool-test.bscr deleted file mode 100644 index 9170fb7c60..0000000000 --- a/regress/win32/tests/scratch-pool-test.bscr +++ /dev/null @@ -1,25 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Scratch drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Scratch drive=0 -update Volume=TestVolume001 MaxVolBytes=2000000 pool=Scratch drive=0 -update Volume=TestVolume001 inchanger=no pool=Scratch drive=0 -@#setdebug level=200 storage=DDS-4 -llist volume=TestVolume001 -llist volume=TestVolume002 -run job=@JobName@ yes -wait -messages -list volumes -llist volume=TestVolume001 -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/scratch-pool-test.cmd b/regress/win32/tests/scratch-pool-test.cmd deleted file mode 100644 index d8e88f400c..0000000000 --- a/regress/win32/tests/scratch-pool-test.cmd +++ /dev/null @@ -1,45 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory -REM to two tapes where the maximum tape file size is set to 1M -REM Note, this test simulates the tape filling and writing to -REM the next tape. One minor wrinkle: we create the two tapes -REM in the Scratch pool, so they should be switched to the Default -REM Pool automatically. -REM We set TestVolume001 to not in the changer, so the algorithm -REM should find TestVolume002 and use it rather than blocking. -REM -REM Note we use the viritual disk autochanger -REM -SET TestName=scratch-pool-test -SET JobName=scratch-pool - -CALL scripts\functions set_debug 0 - -CALL config_out -IF "%AUTOCHANGER%" == "nul" ( - ECHO two-volume-test skipped. No autochanger. - EXIT /b 1 -) - -CALL scripts\cleanup -CALL scripts\copy-2disk-confs >nul 2>&1 -CALL scripts\prepare-two-disks - -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 - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -REM Write out bconsole commands -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\scratch-pool-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=DDS-4 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/six-vol-test.bscr b/regress/win32/tests/six-vol-test.bscr deleted file mode 100644 index e6698df335..0000000000 --- a/regress/win32/tests/six-vol-test.bscr +++ /dev/null @@ -1,19 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -run job=@JobName@ storage=File yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/six-vol-test.cmd b/regress/win32/tests/six-vol-test.cmd deleted file mode 100644 index ab3ca0559b..0000000000 --- a/regress/win32/tests/six-vol-test.cmd +++ /dev/null @@ -1,36 +0,0 @@ -REM -REM Create a 60MB file with random bytes. Back it up to 6 Volumes -REM each constrained to 10MB using the automatic labeling feature. -REM -SET TestName=six-vol-test -SET JobName=SixVol - -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 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 - -CALL scripts\functions change_jobname MultiVol %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\six-vol-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -diff tmp\largefile tmp\bacula-restores\%CD::=%\tmp\largefile >nul 2>&1 -SET dstat=%ERRORLEVEL% -CALL scripts\functions end_test diff --git a/regress/win32/tests/small-file-size-tape b/regress/win32/tests/small-file-size-tape deleted file mode 100644 index 9c68cad1eb..0000000000 --- a/regress/win32/tests/small-file-size-tape +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape where the maximum tape file size is set to 1M -# -TestName="small-file-size-tape" -JobName=smallfilesize -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list -cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1 -sed "s%# Maximum File Size% Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -setdebug level=2 storage=DDS-4 -run job=$JobName yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=DDS-4 -unmark * -mark * -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/span-vol-test.bscr b/regress/win32/tests/span-vol-test.bscr deleted file mode 100644 index 6ec7c37eae..0000000000 --- a/regress/win32/tests/span-vol-test.bscr +++ /dev/null @@ -1,27 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File1 volume=TestVolume004 -label storage=File1 volume=TestVolume003 -label storage=File1 volume=TestVolume002 -label storage=File1 volume=TestVolume001 -update Volume=TestVolume004 MaxVolBytes=3000000 -update Volume=TestVolume003 MaxVolBytes=3000000 -update Volume=TestVolume002 MaxVolBytes=3000000 -run job=@JobName@ storage=File1 yes -wait -list volumes -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File1 -unmark * -mark * -done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/span-vol-test.cmd b/regress/win32/tests/span-vol-test.cmd deleted file mode 100644 index 52cbaffb77..0000000000 --- a/regress/win32/tests/span-vol-test.cmd +++ /dev/null @@ -1,26 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory but -REM split the archive into four volumes, two of which are -REM totally full. I.e. make sure that bsr selects all tapes -REM including those fully spanned. -REM -SET TestName=span-vol-test -SET JobName=SpanVol - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\span-vol-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File1 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/sparse-compressed-test.bscr b/regress/win32/tests/sparse-compressed-test.bscr deleted file mode 100644 index e4d1040296..0000000000 --- a/regress/win32/tests/sparse-compressed-test.bscr +++ /dev/null @@ -1,17 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -run job=SparseCompressedTest yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select all storage=File done -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/sparse-compressed-test.cmd b/regress/win32/tests/sparse-compressed-test.cmd deleted file mode 100644 index e8b701dcf1..0000000000 --- a/regress/win32/tests/sparse-compressed-test.cmd +++ /dev/null @@ -1,23 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory using the Sparse option -REM then restore it. -REM -SET TestName=sparse-compressed-test -SET JobName=Sparse-conpressed - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\sparse-compressed-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/sparse-test.bscr b/regress/win32/tests/sparse-test.bscr deleted file mode 100644 index b7438e9dfb..0000000000 --- a/regress/win32/tests/sparse-test.bscr +++ /dev/null @@ -1,20 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/sparse-test.cmd b/regress/win32/tests/sparse-test.cmd deleted file mode 100644 index a8ba5d1680..0000000000 --- a/regress/win32/tests/sparse-test.cmd +++ /dev/null @@ -1,23 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory using the Sparse option -REM then restore it. -REM -SET TestName=sparse-test -SET JobName=SparseTest - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\sparse-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/test0.cmd b/regress/win32/tests/test0.cmd deleted file mode 100644 index e1824b12b7..0000000000 --- a/regress/win32/tests/test0.cmd +++ /dev/null @@ -1,2 +0,0 @@ -COPY nul test.out >nul 2>&1 -DEL bin\working\* 2>&1 diff --git a/regress/win32/tests/truncate-bug-tape b/regress/win32/tests/truncate-bug-tape deleted file mode 100644 index acfda15f3e..0000000000 --- a/regress/win32/tests/truncate-bug-tape +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh -# -# Test for a tape truncation bug. -# -TestName="truncate-bug-tape" -JobName=truncatebug -. scripts/functions - -set_debug 0 -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default -@# do a bunch of saves so we have 12 files on the tape -run job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -run level=Full job=$JobName yes -@#setdebug level=100 storage=DDS-4 -wait -messages -quit -END_OF_DATA - -run_bacula -scripts/check_for_zombie_jobs storage=DDS-4 - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log2.out -@# -@# now do a restore -@# -restore where=${cwd}/tmp/bacula-restores storage=DDS-4 -3 -@# select JobId=4 (i.e. file five on the tape) -4 -cd ${cwd}/build -@# mark a single file -mark configure -done -yes -wait -messages -@output -quit -END_OF_DATA - -run_bconsole -scripts/check_for_zombie_jobs storage=DDS-4 - -# Now write to tape one more time -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log3.out -run level=Full job=$JobName yes -wait -messages -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -grep "^ Termination: *Backup OK" tmp/log3.out 2>&1 >/dev/null -dstat=$? -end_test diff --git a/regress/win32/tests/two-jobs-test.1.bscr b/regress/win32/tests/two-jobs-test.1.bscr deleted file mode 100644 index 745a2e1011..0000000000 --- a/regress/win32/tests/two-jobs-test.1.bscr +++ /dev/null @@ -1,14 +0,0 @@ -setdebug level=15 storage=File -@output nul -messages -@output nul -estimate job=@JobName@ listing -estimate job=@JobName@ listing -estimate job=@JobName@ listing -messages -@@out@ tmp/log1.out -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/two-jobs-test.2.bscr b/regress/win32/tests/two-jobs-test.2.bscr deleted file mode 100644 index 144ac5f997..0000000000 --- a/regress/win32/tests/two-jobs-test.2.bscr +++ /dev/null @@ -1,27 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -run job=@JobName@ -yes -wait -messages -@# -@# now do several restores to ensure we cleanup between jobs -@# -@output nul -restore where=@topdir@/tmp/bacula-restores select all storage=File done -yes -wait -restore where=@topdir@/tmp/bacula-restores select all storage=File done -yes -wait -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@output -quit diff --git a/regress/win32/tests/two-jobs-test.cmd b/regress/win32/tests/two-jobs-test.cmd deleted file mode 100644 index 3964e90d16..0000000000 --- a/regress/win32/tests/two-jobs-test.cmd +++ /dev/null @@ -1,35 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory using the compressed option -REM then backup a second time and finally restore it -REM -SET TestName=two-jobs-test -SET JobName=Two-Jobs - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname CompressedTest %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\two-jobs-test.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File - -ECHO Backup 1 done -tools\touch build\src\dird\*.c - -REM -REM run a second job -REM -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\two-jobs-test.2.bscr >tmp\bconcmds - -CALL scripts\functions run_bconsole -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/two-pool-tape b/regress/win32/tests/two-pool-tape deleted file mode 100644 index 9da395ae69..0000000000 --- a/regress/win32/tests/two-pool-tape +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# -# This is Arno's test. It uses two pools, two tapes, and -# an autochanger. Note, the Director has three Pools in its -# conf: Default, Full, and Inc. Default is used in the -# NightlySave job by default. What is backed up is what -# is in /tmp/file-list, which is by default the Bacula -# source code (i.e. the build directory). -# -TestName="two-pool-tape" -JobName=twopooltape -. scripts/functions -set_debug 0 - -. config.out -if test x${AUTOCHANGER} = x/dev/null ; then - echo "two-pool-tape test skipped. No autochanger." - exit -fi - -scripts/cleanup -scripts/copy-2tape-confs -echo "Prepare two tapes" -scripts/prepare-two-tapes -echo "Done prepare two tapes" - -# Make a relatively large backup set 5 x source code directory -echo "${cwd}/build" >/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list -echo "${cwd}/build" >>/tmp/file-list - -start_test - -# Write out bconsole commands to a file -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -list volumes -@# Start job with Client run before and sleep -run job=NightlySave1 level=Full pool=Default yes -run job=NightlySave1 level=Full pool=Default yes -run job=NightlySave1 level=Full pool=Default yes -@# wait between starting jobs -@sleep 60 -@#setdebug level=100 storage=DDS-4 -run job=NightlySave2 level=Full pool=Full yes -run job=NightlySave2 level=Full pool=Full yes -run job=NightlySave2 level=Full pool=Full yes -@sleep 10 -messages -@sleep 10 -messages -@sleep 10 -status storage=DDS-4 -messages -wait -list volumes -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -check_restore_diff -end_test diff --git a/regress/win32/tests/two-pool-test.bscr b/regress/win32/tests/two-pool-test.bscr deleted file mode 100644 index 57b3903e6a..0000000000 --- a/regress/win32/tests/two-pool-test.bscr +++ /dev/null @@ -1,36 +0,0 @@ -@output nul -messages -@@out@ tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Full drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -list volumes -@# Start job with Client run before and sleep -run job=NightlySave1 level=Full pool=Default yes -run job=NightlySave1 level=Full pool=Default yes -run job=NightlySave1 level=Full pool=Default yes -@# wait between starting jobs -@sleep 60 -@#setdebug level=100 storage=DDS-4 -run job=NightlySave2 level=Full pool=Full yes -run job=NightlySave2 level=Full pool=Full yes -run job=NightlySave2 level=Full pool=Full yes -@sleep 10 -messages -@sleep 10 -messages -@sleep 10 -status storage=DDS-4 -messages -wait -list volumes -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/two-pool-test.cmd b/regress/win32/tests/two-pool-test.cmd deleted file mode 100644 index e2d9904c36..0000000000 --- a/regress/win32/tests/two-pool-test.cmd +++ /dev/null @@ -1,37 +0,0 @@ -REM -REM This is Arno's test. It uses two pools, two tapes, and -REM an autochanger. Note, the Director has three Pools in its -REM conf: Default, Full, and Inc. Default is used in the -REM NightlySave job by default. What is backed up is what -REM is in /tmp/file-list, which is by default the Bacula -REM source code (i.e. the build directory). -REM -REM Note, we use the virtual disk autochanger. -REM -SET TestName=two-pool-test -SET JobName=Two-pool - -CALL scripts\functions set_debug 0 - -CALL config_out - -CALL scripts\cleanup -CALL scripts\copy-2disk-confs >nul 2>&1 -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 - -CALL scripts\functions start_test - -REM Write out bconsole commands to a file -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\two-pool-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=DDS-4 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/two-vol-test.bscr b/regress/win32/tests/two-vol-test.bscr deleted file mode 100644 index 8de06c5d64..0000000000 --- a/regress/win32/tests/two-vol-test.bscr +++ /dev/null @@ -1,19 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=File1 volume=TestVolume002 -label storage=File1 volume=TestVolume001 -update Volume=TestVolume002 MaxVolBytes=3000000 -run job=@JobName@ storage=File1 yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select all storage=File1 done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/two-vol-test.cmd b/regress/win32/tests/two-vol-test.cmd deleted file mode 100644 index ce59794572..0000000000 --- a/regress/win32/tests/two-vol-test.cmd +++ /dev/null @@ -1,24 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory but -REM split the archive into two volumes -REM -SET TestName=two-vol-test -SET JobName=TwoVol - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\two-vol-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=File1 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/two-volume-tape.1.bscr b/regress/win32/tests/two-volume-tape.1.bscr deleted file mode 100644 index 30ebdf96bf..0000000000 --- a/regress/win32/tests/two-volume-tape.1.bscr +++ /dev/null @@ -1,11 +0,0 @@ -@@out@ nul -messages -@@out@ @topdir@/tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=0 -@#setdebug level=1000 client -run job=@JobName@ yes -wait -messages -quit diff --git a/regress/win32/tests/two-volume-tape.2.bscr b/regress/win32/tests/two-volume-tape.2.bscr deleted file mode 100644 index 6af471c6b7..0000000000 --- a/regress/win32/tests/two-volume-tape.2.bscr +++ /dev/null @@ -1,12 +0,0 @@ -@@out@ nul -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/two-volume-tape.cmd b/regress/win32/tests/two-volume-tape.cmd deleted file mode 100644 index 62e80ecaa9..0000000000 --- a/regress/win32/tests/two-volume-tape.cmd +++ /dev/null @@ -1,48 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory -REM to two tapes where the maximum tape file size is set to 1M -REM Note, this test simulates the tape filling and writing to -REM the next tape. -REM -SET TestName=two-volume-tape -SET JobName=twovoltape -CALL scripts\functions set_debug 0 - -CALL config_out -IF "%AUTOCHANGER%" == "nul" ( - ECHO two-volume-tape test skipped. No autochanger. - EXIT /b 1 -) - -CALL scripts\cleanup -CALL scripts\copy-2tape-confs -CALL scripts\prepare-two-tapes - -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 - -CALL scripts\functions change_jobname %JobName% -CALL scripts\functions start_test - -REM Write out bconsole commands -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\two-volume-tape.1.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=DDS-4 -CALL scripts\functions stop_bacula - -mt -f %TAPE_DRIVE% rewind -mtx -f %AUTOCHANGER% unload -bin\bsleep 15 - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\two-volume-tape.2.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=DDS-4 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/two-volume-test.bscr b/regress/win32/tests/two-volume-test.bscr deleted file mode 100644 index bd08ef35e1..0000000000 --- a/regress/win32/tests/two-volume-test.bscr +++ /dev/null @@ -1,21 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=1 pool=Default drive=0 -label storage=DDS-4 volume=TestVolume002 slot=2 pool=Default drive=0 -update Volume=TestVolume001 MaxVolBytes=3000000 pool=Default drive=0 -@#setdebug level=1000 client -run job=@JobName@ yes -wait -messages -@# -@# now do a restore -@# -@@out@ tmp/log2.out -restore where=@topdir@/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -@@out@ -quit - diff --git a/regress/win32/tests/two-volume-test.cmd b/regress/win32/tests/two-volume-test.cmd deleted file mode 100644 index 9bfe9c88da..0000000000 --- a/regress/win32/tests/two-volume-test.cmd +++ /dev/null @@ -1,35 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory -REM to two tapes where the maximum tape file size is set to 1M -REM Note, this test simulates the tape filling and writing to -REM the next tape. -REM -REM Note we use the viritual disk autochanger -REM -SET TestName=two-volume-test -SET JobName=TwoVolume -CALL scripts\functions set_debug 1 -CALL config_out - -CALL scripts\cleanup -CALL scripts\copy-2disk-confs >nul 2>&1 -CALL scripts\prepare-two-disks - -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 - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -REM Write out bconsole commands -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\two-volume-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula -CALL scripts\functions check_for_zombie_jobs storage=DDS-4 -CALL scripts\functions stop_bacula - -CALL scripts\functions check_two_logs -CALL scripts\functions check_restore_diff -CALL scripts\functions end_test diff --git a/regress/win32/tests/usr-tape-root b/regress/win32/tests/usr-tape-root deleted file mode 100644 index 0f5002d928..0000000000 --- a/regress/win32/tests/usr-tape-root +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the /usr directory -# then restore it. -# -cwd=`pwd` -scripts/copy-tape-confs -scripts/cleanup-tape -echo "/usr" >/tmp/file-list - -echo " " -echo " " -echo " === Starting usr-tape-root test ===" -echo " " -echo " " - -bin/bacula start 2>&1 >/dev/null -bin/bconsole -c bin/bconsole.conf <&1 >/dev/null -cd / -${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/original -cd ${cwd}/tmp/bacula-restores -${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/restored -cd ${cwd}/tmp -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% original >1 -sort <1 >original -# -sed s%.*lib/kbd/consolefonts$%lib/kbd/consolefonts% restored >1 -sort <1 >restored -rm -f 1 -# -cd ${cwd} -diff tmp/original tmp/restored 2>&1 1>/dev/nul -if [ $? != 0 ] ; then - echo " " - echo " " - echo " ===== !!!! usr-tape-root failed !!!! ===== " - echo " ===== !!!! usr-tape-root failed !!!! ===== " >>test.out - echo " " -else - echo " ===== usr-tape-root OK ===== " - echo " ===== usr-tape-root OK ===== " >>test.out - scripts/cleanup -fi diff --git a/regress/win32/tests/verify-vol-tape b/regress/win32/tests/verify-vol-tape deleted file mode 100644 index c544bc6603..0000000000 --- a/regress/win32/tests/verify-vol-tape +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then verify the catalog. -# -TestName="verify-vol-tape" -JobName=VerifyVol -. scripts/functions -set_debug 0 - -copy_tape_confs - -echo "${cwd}/build" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -setdebug level=1 storage=DDS-4 sd -label storage=DDS-4 volume=TestVolume001 pool=Default -run job=$JobName yes -wait -messages -@# -@# now do a verify volume -@# -@$out ${cwd}/tmp/original -run job=VerifyTape pool=Default -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula - -sleep 2 -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -grep "^ Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null -bstat=$? -grep "^ Termination: *Verify OK" ${cwd}/tmp/original 2>&1 >/dev/null -rstat=$? -dstat=0 -end_test diff --git a/regress/win32/tests/verify-vol-test.bscr b/regress/win32/tests/verify-vol-test.bscr deleted file mode 100644 index 8c73bbc59f..0000000000 --- a/regress/win32/tests/verify-vol-test.bscr +++ /dev/null @@ -1,18 +0,0 @@ -@@out@ nul -messages -@@out@ tmp/log1.out -setdebug level=1 storage=File sd -label storage=File volume=TestVolume001 -run job=@JobName@ yes -wait -messages -@# -@# now do a verify volume -@# -@@out@ @topdir@/tmp/original -run job=VerifyVolume -yes -wait -messages -@@out@ -quit diff --git a/regress/win32/tests/verify-vol-test.cmd b/regress/win32/tests/verify-vol-test.cmd deleted file mode 100644 index 377fb3428f..0000000000 --- a/regress/win32/tests/verify-vol-test.cmd +++ /dev/null @@ -1,29 +0,0 @@ -REM -REM Run a simple backup of the Bacula build directory -REM then verify the catalog. -REM -SET TestName=verify-vol-test -SET JobName=VerifyVol - -CALL scripts\functions set_debug 0 -CALL scripts\functions copy_test_confs - -ECHO %CD:\=/%/build >\tmp\file-list - -CALL scripts\functions change_jobname NightlySave %JobName% -CALL scripts\functions start_test - -sed -e "s;@JobName@;%JobName%;g" -e "s;@out@;%out%;g" -e "s;@topdir@;%CD:\=/%;g" tests\verify-vol-test.bscr >tmp\bconcmds - -CALL scripts\functions run_bacula - -bin\bsleep 2 -CALL scripts\functions check_for_zombie_jobs storage=File -CALL scripts\functions stop_bacula - -grep "^ Termination: *Backup OK" tmp\log1.out 2>&1 >nul -SET bstat=%ERRORLEVEL% -grep "^ Termination: *Verify OK" tmp\original 2>&1 >nul -SET rstat=%ERRORLEVEL% -SET dstat=0 -CALL scripts\functions end_test diff --git a/regress/win32/tests/weird-files-test b/regress/win32/tests/weird-files-test deleted file mode 100644 index 96fed89322..0000000000 --- a/regress/win32/tests/weird-files-test +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -TestName="weird-files-test" -JobName=wierd-files -. scripts/functions -set_debug 0 - -if test ! -d weird-files ; then - echo " " - echo "Weird files not configured. Test not run." - exit 0 -fi - -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -change_jobname NightlySave $JobName -# -# Note, we save the weird-files directory twice on purpose -# because this causes problems with hard linked files -# that are only saved once. In 1.33, Bacula now deals -# with this situation. -# -echo "${cwd}/weird-files" >/tmp/file-list -echo "${cwd}/weird-files" >>/tmp/file-list - -start_test - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File -TestVolume001 -run job=$JobName -yes -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=${cwd}/tmp/bacula-restores select storage=File -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -stop_bacula - -${cwd}/bin/testls weird-files | sort >${cwd}/tmp/original -cd tmp/bacula-restores${cwd} -${cwd}/bin/testls weird-files | sort >${cwd}/tmp/restored -cd ${cwd} - -check_two_logs -diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null -dstat=$? -end_test diff --git a/regress/win32/tests/weird-files2-test b/regress/win32/tests/weird-files2-test deleted file mode 100644 index ec328155dd..0000000000 --- a/regress/win32/tests/weird-files2-test +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# then restore it. -# -TestName="weird-files2-test" -JobName=weird-files2 -. scripts/functions -set_debug 0 - -if test ! -d weird-files ; then - echo " " - echo "weird files not configured. Test not run." - exit 0 -fi -cwd=`pwd` -scripts/cleanup -scripts/copy-test-confs -rm -rf weird-files2 -cp -Rp weird-files weird-files2 -echo "${cwd}/weird-files2" >/tmp/file-list - -change_jobname NightlySave $JobName -start_test - -bin/testls weird-files2 >${cwd}/tmp/original - -cat <tmp/bconcmds -@$out /dev/null -messages -@$out tmp/log1.out -label storage=File volume=TestVolume001 -run job=$JobName yes -wait -messages -@$out -quit -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=File -# -# Now mess up the a hard link, and a soft link -# -cd weird-files2 -rm -f hard-file2 -ln hard-file3 hard-file2 -rm -f soft-file2 -ln -s soft-file3 soft-file2 -cd ${cwd} -cat <tmp/bconcmds -@$out /dev/null -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where= storage=File -5 -unmark * -mark * -done -yes -wait -messages -@$out -quit -END_OF_DATA - -run_bconsole -check_for_zombie_jobs storage=File -stop_bacula - -bin/testls weird-files2 >${cwd}/tmp/restored - -check_two_logs -diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null -dstat=$? - -end_test diff --git a/regress/win32/tests/win32-backup-tape b/regress/win32/tests/win32-backup-tape deleted file mode 100644 index 3322da8d49..0000000000 --- a/regress/win32/tests/win32-backup-tape +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# -TestName="win32-backup-tape" -JobName=win32tape -. scripts/functions -set_debug 0 - -scripts/copy-win32-confs -scripts/cleanup-tape - -echo "${cwd}/build" >/tmp/file-list - -change_jobname $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 -run job=$JobName yes -@sleep 10 -status storage=DDS-4 -@sleep 30 -messages -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=c:/tmp/bacula-restores select all storage=DDS-4 done -yes -wait -messages -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -# no diff for now -dstat=0 -end_test diff --git a/regress/win32/tests/win32-to-linux-tape b/regress/win32/tests/win32-to-linux-tape deleted file mode 100644 index 780c7dfb8c..0000000000 --- a/regress/win32/tests/win32-to-linux-tape +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Run a simple backup of the Bacula build directory -# to a tape then restore it, we do that twice to ensure that -# we can correctly append to a tape. -# -TestName="win32-to-linux-tape" -JobName=AutoLabel -. scripts/functions -set_debug 1 - -scripts/copy-win32-confs -scripts/cleanup-tape - -echo "${cwd}/build" >/tmp/file-list - -change_job $JobName -start_test - -cat <tmp/bconcmds -@output /dev/null -messages -@$out tmp/log1.out -label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0 -run job=NightlySave yes -@sleep 10 -status storage=DDS-4 -@sleep 30 -messages -wait -messages -@# -@# now do a restore -@# -@$out tmp/log2.out -restore where=/tmp/bacula-restores client=Tibs select all storage=DDS-4 done -yes -wait -messages -END_OF_DATA - -run_bacula -check_for_zombie_jobs storage=DDS-4 -stop_bacula - -check_two_logs -# No diff for the moment -dstat=0 -end_test -- 2.39.5