From 9ea9e5f17b3ddd6a901172d7cba6d62fcee81fb1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 24 Dec 2015 23:17:17 +0000 Subject: Substitute TARGET_PERL in test/bbackupd config. This is needed for executing the SyncAllowScript, on which several tests depend. --- infrastructure/cmake/CMakeLists.txt | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 4a5d6426..47d30bc5 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -13,21 +13,13 @@ macro(cmake_to_native_path cmake_path native_path) endmacro() set(files_to_configure - infrastructure/BoxPlatform.pm + bin/bbackupd/bbackupd-config + bin/bbstored/bbstored-certs + bin/bbstored/bbstored-config contrib/mac_osx/org.boxbackup.bbackupd.plist contrib/mac_osx/org.boxbackup.bbstored.plist contrib/solaris/bbackupd-manifest.xml contrib/solaris/bbstored-manifest.xml - lib/common/BoxPortsAndFiles.h - test/bbackupd/testfiles/bbackupd.conf - test/bbackupd/testfiles/bbackupd-exclude.conf - test/bbackupd/testfiles/bbackupd-snapshot.conf - test/bbackupd/testfiles/bbackupd-symlink.conf - test/bbackupd/testfiles/bbackupd-temploc.conf - bin/bbackupd/bbackupd-config - lib/bbackupquery/makedocumentation.pl - bin/bbstored/bbstored-certs - bin/bbstored/bbstored-config contrib/debian/bbackupd contrib/debian/bbstored contrib/redhat/bbackupd @@ -37,27 +29,39 @@ set(files_to_configure contrib/solaris/bbackupd-smf-method contrib/solaris/bbstored-smf-method contrib/windows/installer/boxbackup.mpi + infrastructure/BoxPlatform.pm infrastructure/makebuildenv.pl infrastructure/makeparcels.pl infrastructure/makedistribution.pl + lib/bbackupquery/makedocumentation.pl + lib/common/BoxPortsAndFiles.h lib/common/makeexception.pl lib/raidfile/raidfile-config lib/server/makeprotocol.pl runtest.pl test/backupstorefix/testfiles/testbackupstorefix.pl + test/bbackupd/testfiles/bbackupd.conf + test/bbackupd/testfiles/bbackupd-exclude.conf + test/bbackupd/testfiles/bbackupd-snapshot.conf + test/bbackupd/testfiles/bbackupd-symlink.conf + test/bbackupd/testfiles/bbackupd-temploc.conf test/bbackupd/testfiles/extcheck1.pl test/bbackupd/testfiles/extcheck2.pl test/bbackupd/testfiles/notifyscript.pl test/bbackupd/testfiles/syncallowscript.pl ) +# We need to substitute TARGET_PERL in test/bbackupd/testfiles/bbackupd.conf, so define it +# as a variable before running configure_file(). +include(FindPerl) +set(TARGET_PERL ${PERL_EXECUTABLE}) + foreach(file_to_configure ${files_to_configure}) configure_file("${base_dir}/${file_to_configure}.in" "${base_dir}/${file_to_configure}" @ONLY) endforeach() file(READ "${base_dir}/infrastructure/buildenv-testmain-template.cpp" test_template) -include(FindPerl) execute_process( COMMAND ${PERL_EXECUTABLE} ${base_dir}/infrastructure/msvc/getversion.pl -- cgit v1.2.3