From 52eab9be53b4901b941bc9781dd8460e92c5b14a Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Mon, 20 Jul 2026 11:14:33 -0500 Subject: [PATCH 1/2] Fix more assert on assignment causing parenthesis warning --- dunedataprep/DataPrep/Tool/test/test_AdcKeepAllSignalFinder.cxx | 2 +- dunedataprep/DataPrep/Tool/test/test_AdcNoiseSignalFinder.cxx | 2 +- dunedataprep/DataPrep/Tool/test/test_AdcRegularSignalFinder.cxx | 2 +- .../DataPrep/Tool/test/test_AdcThresholdSignalFinder.cxx | 2 +- dunedataprep/DataPrep/Tool/test/test_VintageDeconvoluter.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dunedataprep/DataPrep/Tool/test/test_AdcKeepAllSignalFinder.cxx b/dunedataprep/DataPrep/Tool/test/test_AdcKeepAllSignalFinder.cxx index a6ef5a35..79a450fa 100644 --- a/dunedataprep/DataPrep/Tool/test/test_AdcKeepAllSignalFinder.cxx +++ b/dunedataprep/DataPrep/Tool/test/test_AdcKeepAllSignalFinder.cxx @@ -72,7 +72,7 @@ int test_AdcKeepAllSignalFinder(bool useExistingFcl =false) { data.samples[30] = 150.0; assert( data.signal.size() == 0 ); assert( data.rois.size() == 0 ); - assert( data.samples[30] = 150 ); + assert( data.samples[30] == 150 ); cout << myname << line << endl; cout << myname << "Running tool." << endl; diff --git a/dunedataprep/DataPrep/Tool/test/test_AdcNoiseSignalFinder.cxx b/dunedataprep/DataPrep/Tool/test/test_AdcNoiseSignalFinder.cxx index 35d9075a..934f5933 100644 --- a/dunedataprep/DataPrep/Tool/test/test_AdcNoiseSignalFinder.cxx +++ b/dunedataprep/DataPrep/Tool/test/test_AdcNoiseSignalFinder.cxx @@ -83,7 +83,7 @@ int test_AdcNoiseSignalFinder(bool useExistingFcl =false) { data.samples[30] = 150.0; assert( data.signal.size() == 0 ); assert( data.rois.size() == 0 ); - assert( data.samples[30] = 150 ); + assert( data.samples[30] == 150 ); cout << myname << line << endl; cout << myname << "Running tool." << endl; diff --git a/dunedataprep/DataPrep/Tool/test/test_AdcRegularSignalFinder.cxx b/dunedataprep/DataPrep/Tool/test/test_AdcRegularSignalFinder.cxx index a466077b..1169a5f6 100644 --- a/dunedataprep/DataPrep/Tool/test/test_AdcRegularSignalFinder.cxx +++ b/dunedataprep/DataPrep/Tool/test/test_AdcRegularSignalFinder.cxx @@ -78,7 +78,7 @@ int test_AdcRegularSignalFinder(bool useExistingFcl =false) { assert( data.signal.size() == 0 ); assert( data.rois.size() == 0 ); assert( data.samples.size() == nsam ); - assert( data.samples[30] = 150 ); + assert( data.samples[30] == 150 ); cout << myname << line << endl; cout << myname << "Running tool." << endl; diff --git a/dunedataprep/DataPrep/Tool/test/test_AdcThresholdSignalFinder.cxx b/dunedataprep/DataPrep/Tool/test/test_AdcThresholdSignalFinder.cxx index 7bdbb86c..45323cb6 100644 --- a/dunedataprep/DataPrep/Tool/test/test_AdcThresholdSignalFinder.cxx +++ b/dunedataprep/DataPrep/Tool/test/test_AdcThresholdSignalFinder.cxx @@ -87,7 +87,7 @@ int test_AdcThresholdSignalFinder(bool useExistingFcl =false) { data.samples[30] = 150.0; assert( data.signal.size() == 0 ); assert( data.rois.size() == 0 ); - assert( data.samples[30] = 150 ); + assert( data.samples[30] == 150 ); cout << myname << line << endl; cout << myname << "Running tool." << endl; diff --git a/dunedataprep/DataPrep/Tool/test/test_VintageDeconvoluter.cxx b/dunedataprep/DataPrep/Tool/test/test_VintageDeconvoluter.cxx index b4402b66..ef078648 100644 --- a/dunedataprep/DataPrep/Tool/test/test_VintageDeconvoluter.cxx +++ b/dunedataprep/DataPrep/Tool/test/test_VintageDeconvoluter.cxx @@ -78,7 +78,7 @@ int test_VintageDeconvoluter(bool useExistingFcl =false) { data.samples[30] = 150.0; assert( data.signal.size() == 0 ); assert( data.rois.size() == 0 ); - assert( data.samples[30] = 150 ); + assert( data.samples[30] == 150 ); AdcChannelData data0 = data; data0.signal = data.signal; data0.rois = data.rois; From a98b4ab57a4b12ce3690ae66105aae462b71844d Mon Sep 17 00:00:00 2001 From: Patrick Gartung Date: Wed, 29 Jul 2026 10:18:05 -0500 Subject: [PATCH 2/2] Use CMake variables that exist to define test environment vars --- dunedataprep/DataPrep/Service/test/CMakeLists.txt | 6 +++--- dunedataprep/DataPrep/Tool/test/CMakeLists.txt | 6 +++--- dunedataprep/DataPrep/TpcTool/test/CMakeLists.txt | 2 +- dunedataprep/DataPrep/Utility/test/CMakeLists.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dunedataprep/DataPrep/Service/test/CMakeLists.txt b/dunedataprep/DataPrep/Service/test/CMakeLists.txt index f30bf3f4..30178bd2 100644 --- a/dunedataprep/DataPrep/Service/test/CMakeLists.txt +++ b/dunedataprep/DataPrep/Service/test/CMakeLists.txt @@ -10,10 +10,10 @@ include(CetTest) cet_enable_asserts() cet_transitive_paths(FHICL_DIR BINARY IN_TREE) -cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/fcl ${dunecalib_BINARY_DIR}/fcl ${dunesim_BINARY_DIR}/fcl ${dunesw_BINARY_DIR}/fcl ${duneopdet_BINARY_DIR}/fcl ${duneprototypes_BINARY_DIR}/fcl) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/fcl ${PROJECT_BINARY_DIR}/../dunecalib/fcl ${PROJECT_BINARY_DIR}/../dunesim/fcl ${PROJECT_BINARY_DIR}/../dunesw/fcl ${PROJECT_BINARY_DIR}/../duneopdet/fcl ${PROJECT_BINARY_DIR}/../duneprototypes/fcl) cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) -cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) -cet_test_env_prepend(FW_SEARCH_APTH ${PROJECT_BINARY_DIR}/fcl) +cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR} ${PROJECT_BINARY_DIR}/../dunesim/lib) +cet_test_env_prepend(FW_SEARCH_PATH ${PROJECT_BINARY_DIR}/fcl ${PROJECT_BINARY_DIR}/../dunecore/gdml) cet_test(test_ConfigurableAdcChannelDataCopyService SOURCE diff --git a/dunedataprep/DataPrep/Tool/test/CMakeLists.txt b/dunedataprep/DataPrep/Tool/test/CMakeLists.txt index 04fcd083..5c6ff0e1 100644 --- a/dunedataprep/DataPrep/Tool/test/CMakeLists.txt +++ b/dunedataprep/DataPrep/Tool/test/CMakeLists.txt @@ -8,11 +8,11 @@ include(CetTest) cet_transitive_paths(FHICL_DIR BINARY IN_TREE) -cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/fcl ${dunecalib_BINARY_DIR}/fcl ${dunesim_BINARY_DIR}/fcl ${duneopdet_BINARY_DIR}/fcl ${dunedataprep_BINARY_DIR}/fcl ${dunesw_BINARY_DIR}/fcl ${duneprototypes_BINARY_DIR}/fcl) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/fcl ${PROJECT_BINARY_DIR}/../dunecalib/fcl ${PROJECT_BINARY_DIR}/../dunesim/fcl ${PROJECT_BINARY_DIR}/../duneopdet/fcl ${PROJECT_BINARY_DIR}/../dunedataprep/fcl ${PROJECT_BINARY_DIR}/../dunesw/fcl ${PROJECT_BINARY_DIR}/../duneprototypes/fcl) cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) -cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) +cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR} ${PROJECT_BINARY_DIR}/../dunesim/lib ${PROJECT_BINARY_DIR}/../duneprototypes/lib) cet_transitive_paths(GDML_DIR BINARY IN_TREE) -cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR} ${PROJECT_BINARY_DIR}/gdml ${dunecore_BINARY_DIR}/gdml) +cet_test_env_prepend(FW_SEARCH_PATH ${TRANSITIVE_PATHS_WITH_GDML_DIR} ${PROJECT_BINARY_DIR}/gdml ${PROJECT_BINARY_DIR}/../dunecore/gdml) cet_test(test_StandardAdcChannelStringTool SOURCE diff --git a/dunedataprep/DataPrep/TpcTool/test/CMakeLists.txt b/dunedataprep/DataPrep/TpcTool/test/CMakeLists.txt index a90861e0..3090fa4b 100644 --- a/dunedataprep/DataPrep/TpcTool/test/CMakeLists.txt +++ b/dunedataprep/DataPrep/TpcTool/test/CMakeLists.txt @@ -8,7 +8,7 @@ include(CetTest) cet_transitive_paths(FHICL_DIR BINARY IN_TREE) -cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/fcl ${dunesim_BINARY_DIR}/fcl) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/fcl ${PROJECT_BINARY_DIR}/../dunesim/fcl) cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR}) diff --git a/dunedataprep/DataPrep/Utility/test/CMakeLists.txt b/dunedataprep/DataPrep/Utility/test/CMakeLists.txt index 9dcb7afa..a33d417f 100644 --- a/dunedataprep/DataPrep/Utility/test/CMakeLists.txt +++ b/dunedataprep/DataPrep/Utility/test/CMakeLists.txt @@ -8,7 +8,7 @@ include(CetTest) cet_transitive_paths(FHICL_DIR BINARY IN_TREE) -cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${dunesim_BINARY_DIR}/fcl) +cet_test_env_prepend(FHICL_FILE_PATH "." ${TRANSITIVE_PATHS_WITH_FHICL_DIR} ${PROJECT_BINARY_DIR}/../dunesim/fcl) cet_transitive_paths(LIBRARY_DIR BINARY IN_TREE) cet_test_env_prepend(CET_PLUGIN_PATH ${TRANSITIVE_PATHS_WITH_LIBRARY_DIR})