From 16c2179b21f3673f6c3b98050b5674cf7b216bd8 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sat, 2 Aug 2003 19:29:24 +0000 Subject: [PATCH] Clean up for Solaris git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@657 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/tests/concurrent-jobs-test | 16 ++++++++++++++-- regress/tests/six-vol-test | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test index 804e00541d..1109a23d58 100755 --- a/regress/tests/concurrent-jobs-test +++ b/regress/tests/concurrent-jobs-test @@ -6,9 +6,21 @@ cwd=`pwd` scripts/copy-test-confs scripts/cleanup 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 + 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" bin/bacula stop 2>&1 >/dev/null bin/drop_sqlite_tables diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test index c5a99736ea..362df870b5 100755 --- a/regress/tests/six-vol-test +++ b/regress/tests/six-vol-test @@ -4,7 +4,7 @@ # each constrained to 10MB using the automatic labeling feature. # -if test ! -e /dev/urandom ; then +if test ! -c /dev/urandom ; then echo "No random device. Test skipped.\n" exit 0 fi -- 2.39.5