fix tests that were broken by file name changes

mpictor · mpictor · commit 7f0a0f852f8a · 2014-03-01T11:53:31.000-05:00
diff --git a/src/exp2cxx/test/inverse_qualifiers.cmake b/src/exp2cxx/test/inverse_qualifiers.cmake
@@ -2,7 +2,7 @@ cmake_minimum_required( VERSION 2.8 )
 
 # executable is ${EXE}, input file is ${INFILE}
 
-set( ofile "SdaiINVERSE_PROBLEM.init.cc" )
+set( ofile "entity/SdaiAssembly_component.cc" )
 execute_process( COMMAND ${EXE} ${INFILE}
   RESULT_VARIABLE CMD_RESULT )
 if( NOT ${CMD_RESULT} EQUAL 0 )
diff --git a/test/cpp/schema_specific/CMakeLists.txt b/test/cpp/schema_specific/CMakeLists.txt
@@ -11,7 +11,9 @@ include_directories( ${SC_SOURCE_DIR}/src/cldai ${SC_SOURCE_DIR}/src/cleditor ${
 function( add_schema_dependent_test name sdai_lib exe_args )
   # need the path to the lib sources for -I
   get_target_property( sdai_srcs sdai_${sdai_lib} SOURCES )
-  list(GET sdai_srcs 0 fullpath )
+
+  # -1 --> last item in list, which will be a file that isn't in a subdir
+  list(GET sdai_srcs -1 fullpath )
   get_filename_component(sdai_src_path ${fullpath} PATH )
 
   add_executable( tst_${name} "${name}.cc" )
@@ -60,7 +62,7 @@ add_schema_dependent_test( "attribute" "inverse_attr" "${SC_SOURCE_DIR}/test/p21
 
 if(HAVE_STD_THREAD)
   # for best results, use a large file. as1-oc-214.stp is currently the largest file in the repo that sc works with.
-  add_schema_dependent_test( "stepfile_rw_progress" "AP214E3_2010"
+  add_schema_dependent_test( "stepfile_rw_progress" "ap214e3"
     "${SC_SOURCE_DIR}/data/ap214e3/as1-oc-214.stp" "-pthread -std=c++0x" "pthread" )
 endif(HAVE_STD_THREAD)
 
diff --git a/test/p21/CMakeLists.txt b/test/p21/CMakeLists.txt
@@ -50,7 +50,7 @@ set(sn_insts "
 set(schema_name_good     "AUTOMOTIVE_DESIGN")
 set(schema_name_good_asn "AUTOMOTIVE_DESIGN { 1 0 10303 214 1 1 1 1 }")
 set(schema_name_mismatch "DOES_NOT_MATCH")
-set(p21read_ap214 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/p21read_sdai_AP214E3_2010")
+set(p21read_ap214 "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/p21read_sdai_ap214e3")
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/exch_file_good.p21      "${P21_FILE_HEAD}${schema_name_good}${P21_FILE_MID}
 ${sn_insts}${P21_FILE_TAIL}")
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/exch_file_good_asn.p21  "${P21_FILE_HEAD}${schema_name_good_asn}${P21_FILE_MID}
