From: Eric Bollengier <eric@baculasystems.com>
Date: Wed, 2 Sep 2020 13:02:15 +0000 (+0200)
Subject: BEE Backport regress/tests/tls-duplicate-job-test
X-Git-Tag: Release-11.3.2~1258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc9cce65922a0448ac25974effb89bb0b7f41fdb;p=thirdparty%2Fbacula.git

BEE Backport regress/tests/tls-duplicate-job-test

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Thu Feb 9 16:41:40 2017 +0100

    regress: Fix tls-duplicate-job-test with FORCE_DEDUP
---

diff --git a/regress/tests/tls-duplicate-job-test b/regress/tests/tls-duplicate-job-test
index 87790c8531..9b389b463c 100755
--- a/regress/tests/tls-duplicate-job-test
+++ b/regress/tests/tls-duplicate-job-test
@@ -2,8 +2,6 @@
 #
 # Copyright (C) 2000-2020 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
-#
-
 #
 #
 TestName="tls-duplicate-job-test"
@@ -13,17 +11,19 @@ scripts/cleanup
 scripts/copy-tls-confs
 echo "${cwd}/build/ChangeLog" >${cwd}/tmp/file-list
 
+# With dedup, we need to force the dedup fileset option
+DEDUP_FS_OPTION=storage
+
 # increase the maximum concurrent jobs for FD, SD and DIR
-perl -Mscripts::functions -e 'set_maximum_concurrent_jobs("$conf/bacula-dir.conf",100)'
-perl -Mscripts::functions -e 'set_maximum_concurrent_jobs("$conf/bacula-sd.conf",100)'
-perl -Mscripts::functions -e 'set_maximum_concurrent_jobs("$conf/bacula-fd.conf",100)'
+$bperl -e 'set_maximum_concurrent_jobs("$conf/bacula-dir.conf",100)'
+$bperl -e 'set_maximum_concurrent_jobs("$conf/bacula-sd.conf",100)'
+$bperl -e 'set_maximum_concurrent_jobs("$conf/bacula-fd.conf",100)'
 
 # extract a Job and add a runscript on it
-perl -Mscripts::functions \
+$bperl \
     -e "extract_resource('$conf/bacula-dir.conf', 'Job', 'CompressedTest')" \
     | sed 's%Standard%Standard; ClientRunBeforeJob="sleep 6"%' > $tmp/1
 
-
 outf="$tmp/sed_tmp"
 echo 's%CompressedTest%AllowDuplicateYes%' > $outf
 echo 's%Backup%Backup; AllowDuplicateJobs = yes%' >> $outf