configure/ci.inria.fr: fix PATH

contrib/ci.inria.fr/job-1-build-windows.sh

@@ -18,6 +18,7 @@
 set -e
 
 oldPATH=$PATH
+export PATH=/c/Builds:/usr/bin:/bin:"/c/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin":"/c/Program Files/Microsoft Visual Studio 11.0/Common7/IDE":$oldPATH
 
 tarball=$(ls -tr starpu*.tar.gz | tail -1)
 if test -z "$tarball" ; then
@@ -25,8 +26,6 @@ if test -z "$tarball" ; then
     exit 2
 fi
 
-export PATH=/usr/bin:/bin:$PATH
-
 basename=$(basename $tarball .tar.gz)
 test -d $basename && chmod -R u+rwX $basename && rm -rf $basename
 tar xfz $tarball
@@ -40,20 +39,19 @@ rm -rf ${basename}/build
 mkdir ${basename}/build
 cd ${basename}/build
 
-export PATH=/c/Builds:/c/msys64/mingw64/bin:"/c/Program Files (x86)/Microsoft Visual Studio 11.0/VC/bin":"/c/Program Files/Microsoft Visual Studio 11.0/Common7/IDE":$oldPATH
 #export HWLOC=/c/StarPU/hwloc-win32-build-1.11.0
 
 prefix=${PWD}/../../${winball}
 rm -rf $prefix
 
+#--with-hwloc=${HWLOC}
+options="--without-hwloc --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads"
 day=$(date +%u)
 if test $day -le 5
 then
-#    ../configure --prefix=$prefix --with-hwloc=${HWLOC} --disable-build-examples --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads
-    ../configure --prefix=$prefix --without-hwloc --disable-build-examples --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads
+    ../configure --prefix=$prefix $options --disable-build-examples
 else
-#    ../configure --prefix=$prefix --with-hwloc=${HWLOC} --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads
-    ../configure --prefix=$prefix --without-hwloc --enable-quick-check --enable-debug --enable-verbose --enable-native-winthreads
+    ../configure --prefix=$prefix $options
 fi
 
 make

contrib/ci.inria.fr/job-1-check-windows.bat

@@ -15,7 +15,7 @@ REM See the GNU Lesser General Public License in COPYING.LGPL for more details.
 REM
 
 set oldPATH=%PATH%
-set PATH=%PATH%;C:\MinGW\msys\1.0\bin;c:\MinGW\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x64;C:\Users\Administrator\AppData\Local\Programs\Python\Python37-32
+set PATH=C:\MinGW\msys\1.0\bin;c:\MinGW\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x64;C:\Users\Administrator\AppData\Local\Programs\Python\Python37-32;%PATH%
 sh -c "./job-1-build-windows.sh"
 set PATH=%oldPATH%
 set HWLOC=c:\StarPU\hwloc-win32-build-1.11.0