Merge pull request #474 from tpaviot/review/fix-travis-occt-tests

Fix several OCCT test failures
tpaviot · Feb 9, 2014 · 0f4fe7e · 0f4fe7e
2 parents dc6ff44 + f080548
commit 0f4fe7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,14 +16,6 @@ before_script:
 #  to filter out 'begin' or 'end' files.
   - find tests -type f -name '[A-Z][0-9]' -o -name 'Z[A-Z][0-9]' -o -name 'bu[gc]*' | xargs grep -l locate_data_file /dev/null | xargs rm -f
   - rm -rf tests/chamfer tests/de tests/mesh tests/perf/*_mesh_*
-#  Builds hang, remove some tests to find the culprit
-#  GOOD: - rm -rf tests/bugs tests/demo tests/xml
-#  BAD - rm -rf tests/bugs tests/demo
-#  BAD - rm -rf tests/xml/xcaf_*
-#  BAD - rm -rf tests/xml/ocaf_*
-#  BAD - rm -rf tests/xml/ocaf_* tests/xml/xcaf_xml
-#  GOOD - rm -rf tests/xml
-  - rm -rf tests/xml
   - mkdir cmake-build
   - cd cmake-build
 #  Depth is necessary, otherwise DRAWEXE exits with this message:

diff --git a/adm/cmake/config/DrawLaunchTests.cmake.in b/adm/cmake/config/DrawLaunchTests.cmake.in
@@ -1,16 +1,19 @@
 set(ENV{CASROOT}                      "@OCE_SOURCE_DIR@")
 set(ENV{DRAWDEFAULT}                  "@OCE_SOURCE_DIR@/src/DrawResources/DrawDefault")
 set(ENV{DRAWHOME}                     "@OCE_SOURCE_DIR@/src/DrawResources")
-set(ENV{CSF_DrawPluginDefaults}       "@OCE_SOURCE_DIR@/src/DrawResources")
-set(ENV{CSF_PluginDefaults}           "@OCE_SOURCE_DIR@/src/StdResource")
 set(ENV{CSF_GraphicShr}               "@OCE_CSF_GraphicShr@")
 set(ENV{CSF_UnitsLexicon}             "@OCE_SOURCE_DIR@/src/UnitsAPI/Lexi_Expr.dat")
 set(ENV{CSF_UnitsDefinition}          "@OCE_SOURCE_DIR@/src/UnitsAPI/Units.dat")
-set(ENV{CSF_CurrentUnitsDefaults}     "@OCE_SOURCE_DIR@/src/StdResource/CurrentUnits")
-set(ENV{CSF_MDTVCurrentUnitsDefaults} "@OCE_SOURCE_DIR@/src/StdResource/MDTVCurrentUnits")
-set(ENV{CSF_STEPDefaults}             "@OCE_SOURCE_DIR@/src/XSTEPResource/STEP")
-set(ENV{CSF_IGESDefaults}             "@OCE_SOURCE_DIR@/src/XSTEPResource/IGES")
+set(ENV{CSF_CurrentUnitsDefaults}     "@OCE_SOURCE_DIR@/src/UnitsAPI")
+set(ENV{CSF_MDTVCurrentUnitsDefaults} "@OCE_SOURCE_DIR@/src/UnitsAPI")
+set(ENV{CSF_PluginDefaults}           "@OCE_SOURCE_DIR@/src/StdResource")
 set(ENV{CSF_XCAFDefaults}             "@OCE_SOURCE_DIR@/src/StdResource")
+set(ENV{CSF_TObjDefaults}             "@OCE_SOURCE_DIR@/src/StdResource")
+set(ENV{CSF_StandardDefaults}         "@OCE_SOURCE_DIR@/src/StdResource")
+set(ENV{CSF_StandardLiteDefaults}     "@OCE_SOURCE_DIR@/src/StdResource")
+set(ENV{CSF_STEPDefaults}             "@OCE_SOURCE_DIR@/src/XSTEPResource")
+set(ENV{CSF_IGESDefaults}             "@OCE_SOURCE_DIR@/src/XSTEPResource")
+set(ENV{CSF_DrawPluginDefaults}       "@OCE_SOURCE_DIR@/src/DrawResources")
 set(ENV{@OCE_TEST_PATH_VAR_NAME@}     "@OCE_TEST_PATH@")
 set(ENV{OCE_SKIP_TESTS_DATA}          "1")
 execute_process(COMMAND @DRAWEXE_COMMAND@ -v -f DrawLaunchTests.draw)