Windows CI fixes (AcademySoftwareFoundation#2796)

* fixes to make vs2019 CI run. Not passing yet as some tests fail * added explicit ctest timeout (180sec) + misc fixes to run CI local * disable Windows VS2019 tests again as they are not passing yet Co-authored-by: Dieter De Baets <dieter.baets@unity3d.com>
lgritz · Dec 31, 2020 · 4cf32b3 · 4cf32b3
1 parent 11b03fc
commit 4cf32b3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/build-scripts/ci-build-and-test.bash b/src/build-scripts/ci-build-and-test.bash
@@ -55,7 +55,7 @@ if [[ "${SKIP_TESTS:=0}" == "0" ]] ; then
     echo "Parallel test " ${CTEST_PARALLEL_LEVEL}
     # make $BUILD_FLAGS test
     pushd build/$PLATFORM
-    ctest -C ${CMAKE_BUILD_TYPE} -E broken --force-new-ctest-process --output-on-failure
+    ctest -C ${CMAKE_BUILD_TYPE} -E broken --force-new-ctest-process --output-on-failure --timeout 180
     popd
 fi
 

diff --git a/src/build-scripts/gh-win-installdeps.bash b/src/build-scripts/gh-win-installdeps.bash
@@ -21,9 +21,13 @@ VCPKG_INSTALLATION_ROOT=/c/vcpkg
 export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH:=.}
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$DEP_DIR"
 export BOOST_ROOT=${BOOST_ROOT_1_72_0}
+
+BOOST_UNIX_PATH=$(echo "/$BOOST_ROOT" | sed -e 's/\\/\//g' -e 's/://')
+echo "BOOST_UNIX_PATH=$BOOST_UNIX_PATH"
+
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$BOOST_ROOT"
 export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$VCPKG_INSTALLATION_ROOT/installed/x64-windows"
-export PATH="$PATH:$DEP_DIR/bin:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin:/bin"
+export PATH="$PATH:$DEP_DIR/bin:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin:/bin:${BOOST_UNIX_PATH}/lib:${BOOST_UNIX_PATH}/bin:${BOOST_UNIX_PATH}/lib64-msvc-14.2:$PWD/ext/dist/bin:$PWD/ext/dist/lib"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DEP_DIR/bin:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/bin"
 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DEP_DIR/lib:$VCPKG_INSTALLATION_ROOT/installed/x64-windows/lib"
 
@@ -122,9 +126,12 @@ ls -R -l "$DEP_DIR"
 
 src/build-scripts/install_test_images.bash
 
-ls /c/hostedtoolcache/windows/Python
-echo "/c/hostedtoolcache/windows/Python/3.6.8/x64"
-ls /c/hostedtoolcache/windows/Python/3.6.8/x64
+if [[ -e /c/hostedtoolcache/windows/Python ]] ; then
+	ls /c/hostedtoolcache/windows/Python
+	echo "/c/hostedtoolcache/windows/Python/3.6.8/x64"
+	ls /c/hostedtoolcache/windows/Python/3.6.8/x64
+fi
+
 
 
 # source src/build-scripts/build_openexr.bash

diff --git a/testsuite/runtest.py b/testsuite/runtest.py
@@ -194,11 +194,7 @@ def oiio_app (app):
     if (platform.system () != 'Windows' or options.devenv_config == ""):
         return os.path.join (path, "bin", app) + " "
     else:
-        return os.path.join (path, "bin", app) + " "
-        # Old... not true any more?
-        # When we use Visual Studio, built applications are stored
-        # in the app/$(OutDir)/ directory, e.g., Release or Debug.
-        # return os.path.join (path, "src", app, options.devenv_config, app) + " "
+        return os.path.join (path, "bin", options.devenv_config, app) + " "
 
 
 # Construct a command that will print info for an image, appending output to