diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 548932db..9f11f625 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -360,9 +360,6 @@ foreach (test ${stateOfChargeTests}) endforeach (model) endforeach (test) -## Plot test -add_plot_test(SPEC_TYPE "Preset" MODEL_NAME "AquaThermAire" TEST_NAME "Villara/AquaThermAire/villara_24hr67" ) - ## Regression tests #Add general 24-h tests foreach (test ${testNames}) @@ -376,7 +373,6 @@ endforeach (test) foreach (test ${maxTempTests}) foreach (model ${maxTempModels}) add_regression_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "Preset") - add_regression_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "File" COMPARE_SPEC_TYPE "Preset") endforeach (model) endforeach (test) @@ -384,7 +380,6 @@ endforeach (test) foreach (test ${largeCompressorTests}) foreach (model ${largeCompressorNames}) add_regression_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "Preset") - add_regression_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "File" COMPARE_SPEC_TYPE "Preset") endforeach (model) endforeach (test) @@ -392,7 +387,6 @@ endforeach (test) foreach (test ${stateOfChargeTests}) foreach (model ${stateOfChargeCompressorNames}) add_regression_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "Preset") - add_regression_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "File" COMPARE_SPEC_TYPE "Preset") endforeach (model) endforeach (test) @@ -441,5 +435,8 @@ endforeach (test) #Add regression test for yearly file add_test(NAME "RegressionTest.YearRuns" COMMAND ${CMAKE_COMMAND} -E compare_files "${CMAKE_CURRENT_BINARY_DIR}/output/DHW_YRLY.csv" "${CMAKE_CURRENT_SOURCE_DIR}/ref/DHW_YRLY.csv") +## Plot test +add_plot_test(SPEC_TYPE "Preset" MODEL_NAME "AquaThermAire" TEST_NAME "Villara/AquaThermAire/villara_24hr67" ) + # Add unit tests add_subdirectory(unit_tests)