Skip to content
Snippets Groups Projects
Commit aae9fd4d authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

repairs

parent cadd0e4d
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
############################################################################ ############################################################################
set(CORE_STD_OUT_DIR ${BUILD_REF_DIR}/StandardSuite) set(CORE_STD_OUT_DIR ${BUILD_REF_DIR}/StandardSuite)
set(CORE_STD_REF_DIR ${REFERECNCE_DIR}/StandardSuite) set(CORE_STD_REF_DIR ${REFERENCE_DIR}/StandardSuite)
set(CORE_SPECIAL_OUT_DIR ${BUILD_REF_DIR}/Special) set(CORE_SPECIAL_OUT_DIR ${BUILD_REF_DIR}/Special)
# CoreStandardTest cases: # CoreStandardTest cases:
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "IntensityDataIOFactory.h" #include "IntensityDataIOFactory.h"
#include "TestConfig.h" #include "TestConfig.h"
#include "Utils.h" #include "Utils.h"
#include <cassert>
CoreTest::CoreTest( CoreTest::CoreTest(
const std::string& name, const std::string& description, GISASSimulation* simulation, const std::string& name, const std::string& description, GISASSimulation* simulation,
...@@ -39,11 +40,10 @@ CoreTest::~CoreTest() ...@@ -39,11 +40,10 @@ CoreTest::~CoreTest()
void CoreTest::runTest() void CoreTest::runTest()
{ {
if (!m_simulation) assert(m_simulation);
throw Exceptions::NullPointerException(
"CoreTest::runTest() -> Error. Uninitialized simulation object.");
m_simulation->runSimulation(); m_simulation->runSimulation();
assert(CORE_STD_REF_DIR!="");
m_ref_filename = CORE_STD_REF_DIR + "/" + getName() + ".int.gz"; m_ref_filename = CORE_STD_REF_DIR + "/" + getName() + ".int.gz";
try { try {
m_reference = IntensityDataIOFactory::readOutputData( m_ref_filename ); m_reference = IntensityDataIOFactory::readOutputData( m_ref_filename );
......
...@@ -9,6 +9,8 @@ if(POLICY CMP0042) ...@@ -9,6 +9,8 @@ if(POLICY CMP0042)
endif() endif()
# --- source and include files --------- # --- source and include files ---------
configure_file(TestConfig.h.in ${BUILD_INC_DIR}/TestConfig.h @ONLY)
set(include_dirs ${BUILD_INC_DIR} ${CORE_SOURCE_DIRS} ${GSL_INCLUDE_DIR} set(include_dirs ${BUILD_INC_DIR} ${CORE_SOURCE_DIRS} ${GSL_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/Fit/Parameters # for INamed.h ${CMAKE_SOURCE_DIR}/Fit/Parameters # for INamed.h
${CMAKE_SOURCE_DIR}/Fit/Utils ${CMAKE_SOURCE_DIR}/Fit/Utils
......
...@@ -130,7 +130,6 @@ endif() ...@@ -130,7 +130,6 @@ endif()
configure_file(${TEMPLATE_DIR}/CTestCustom.cmake.in ${CMAKE_BINARY_DIR}/CTestCustom.cmake) configure_file(${TEMPLATE_DIR}/CTestCustom.cmake.in ${CMAKE_BINARY_DIR}/CTestCustom.cmake)
configure_file(${TEMPLATE_DIR}/TestConfig.h.in ${BUILD_INC_DIR}/TestConfig.h @ONLY)
configure_file(${TEMPLATE_DIR}/BAPython.h.in ${BUILD_INC_DIR}/BAPython.h @ONLY) configure_file(${TEMPLATE_DIR}/BAPython.h.in ${BUILD_INC_DIR}/BAPython.h @ONLY)
configure_file(${TEMPLATE_DIR}/BAVersion.h.in ${BUILD_INC_DIR}/BAVersion.h @ONLY) configure_file(${TEMPLATE_DIR}/BAVersion.h.in ${BUILD_INC_DIR}/BAVersion.h @ONLY)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BUILD_INC_DIR}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BUILD_INC_DIR}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment