Update IDD path for library call test; update dummy cli args

NREL · Sep 1, 2015 · 66d52ae · 66d52ae · nrel-bot · Sep 1, 2015
1 parent af53c10
commit 66d52ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cmake/RunCallbackTest.cmake b/cmake/RunCallbackTest.cmake
@@ -5,7 +5,7 @@
   # Currently the TestEnergyPlusCallbacks runner does not exit. Give it an idf and supporting files so that it will run.
   execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${SOURCE_DIR}/testfiles/${IDF_FILE}" "${BINARY_DIR}/${TEST_DIR}/in.idf" )
   execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${SOURCE_DIR}/weather/${EPW_FILE}" "${BINARY_DIR}/${TEST_DIR}/in.epw" )
-  execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${BINARY_DIR}/Energy+.idd" "${BINARY_DIR}/${TEST_DIR}/Energy+.idd" )
+  execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${BINARY_DIR}/Products/Energy+.idd" "${BINARY_DIR}/${TEST_DIR}/Energy+.idd" )
 
   # Find and execute the test executable, passing the argument of the directory to run in
   if( WIN32 )

diff --git a/src/EnergyPlus/EnergyPlusPgm.cc b/src/EnergyPlus/EnergyPlusPgm.cc
@@ -372,8 +372,8 @@ EnergyPlusPgm( std::string const & filepath )
 			exit(EXIT_FAILURE);
 		}
 		ProgramPath = filepath + pathChar;
-		int dummy_argc = 0;
-		const char * dummy_argv[] = { nullptr };
+		int dummy_argc = 1;
+		const char * dummy_argv[1] = { "energyplus" };
 		CommandLineInterface::ProcessArgs( dummy_argc, dummy_argv );
 	}