Commit 4b19b240 authored by Jan Möbius's avatar Jan Möbius

Missing files

parent e9862d0b
......@@ -103,7 +103,7 @@ echo "====================================="
echo "====================================="
bash run_tests.sh
python3 run_tests.py
cd ..
......@@ -36,4 +36,4 @@ fi
# Run tests
cd tests
bash run_tests.sh
/opt/local/bin/python3 run_tests.py
@echo off
echo %Time%: Bootstrap level 1 at working directory %CD% with current error level %errorlevel% ...
REM #######################################
REM # bootstrap level 1
REM #######################################
REM remove the artifacts folder, it may cause problems with e.g. cmake
echo %Time%: Bootstrap level 1 at working directory %CD% with current error level %errorlevel% ...
echo %Time%: Removing artifacts directory ...
rmdir /Q /S artifacts
echo %Time%: Bootstrap level 1 at working directory %CD% with current error level %errorlevel% ...
REM call the stage 2 script
echo %Time%: Bootstrap level 1 at working directory %CD% with current error level %errorlevel% ...
echo %Time%: Calling %~dp0%STAGE2SCRIPT% from working directory %CD% with current error level %errorlevel% ...
call %~dp0%STAGE2SCRIPT%
echo %Time%: Stage 2 returned with error level: %errorlevel% at working directory: %CD%
IF %errorlevel% NEQ 0 exit /b %errorlevel%
echo %Time%: Stage 2 script executed successfully
REM store the error code of the stage 2 script
set bootstrapretval=%errorlevel%
REM copy this script back to the artifacts folder
if not exist ./artifacts (
echo %Time%: recrerating artifacts directory ...
cd %~dp0\..
mkdir artifacts
cd artifacts
mkdir CI
cd ..
)
echo %Time%: restoring bootstrap script ...
copy %~dp0\ci-windows-bootstrap.bat artifacts\CI\ci-windows-bootstrap.bat
REM when this script returns, the windows Command interpreter will look
REM at the original position for the script to continue after the the call command
REM of level 0
exit /b %bootstrapretval%
......@@ -17,58 +17,23 @@ REM #######################################
REM # bootstrap level 0
REM #######################################
IF "%BOOTSTRAPLEVEL%" == "" (
set BOOTSTRAPLEVEL=0
)
IF "%BOOTSTRAPLEVEL%" == "0" (
echo %Time%: Bootstrap script line 1 at level 0 with working directory %CD% and current error level %errorlevel% ...
REM copy all files from artifacts folder to root folder
echo %TIME%: Restoring artifacts from artifacts directory ...
robocopy artifacts ./ /e /NFL /NDL /NJH /NJS /nc /ns /np
REM set the bootstrap level to 1
echo %TIME%: Entering bootstrap level 1 ...
set BOOTSTRAPLEVEL=1
REM call the copy of this script outside artifacts folder
call %~dp0\..\..\CI\ci-windows-bootstrap.bat
REM return the error code if not 0
IF "%errorlevel%" NEQ "0" exit /b %errorlevel%
) else (
echo %Time%: Returning after robocopy with working directory %CD% with current error level %errorlevel% ...
REM #######################################
REM # bootstrap level 1
REM #######################################
REM remove the artifacts folder, it may cause problems with e.g. cmake
echo %Time%: Removing artifacts directory ...
rmdir /Q /S artifacts
cmd /c "exit /b 0"
REM call the stage 2 script
echo %Time%: Calling %~dp0\%STAGE2SCRIPT% ...
call %~dp0\%STAGE2SCRIPT%
echo %Time%: Preparing to enter Bootstrap level 1 from working directory %CD% with current error level %errorlevel% ...
REM store the error code of the stage 2 script
set bootstrapretval=%errorlevel%
echo %Time%: Now calling %~dp0..\..\CI\ci-windows-bootstrap.bat
REM copy this script back to the artifacts folder
if not exist ./artifacts (
echo %Time%: recrerating artifacts directory ...
cd %~dp0\..
mkdir artifacts
cd artifacts
mkdir CI
cd ..
)
echo %Time%: restoring bootstrap script ...
copy %~dp0\ci-windows-bootstrap.bat artifacts\CI\ci-windows-bootstrap.bat
REM call the copy of this script outside artifacts folder
call %~dp0..\..\CI\ci-windows-bootstrap-level1.bat
REM when this script returns, the windows Command interpreter will look
REM at the original position for the script to continue after the the call command
REM of level 0
IF "%bootstrapretval%" NEQ "0" exit /b %bootstrapretval%
)
\ No newline at end of file
REM return the error code if not 0
IF "%errorlevel%" NEQ "0" exit /b %errorlevel%
......@@ -13,60 +13,16 @@ call %~dp0\ci-windows-config.bat
ECHO "============================================================="
ECHO "============================================================="
ECHO "Building with :"
ECHO "Building as user :"
whoami
ECHO "ARCHITECTURE : %ARCHITECTURE%"
ECHO "BUILD_PLATFORM : %BUILD_PLATFORM%"
ECHO "GTESTVERSION : %GTESTVERSION%"
ECHO "GENERATOR : %GENERATOR%"
ECHO "VS_PATH : %VS_PATH%"
ECHO "LIBPATH : %LIBPATH%"
ECHO "QT_INSTALL_PATH : %QT_INSTALL_PATH%"
ECHO "CMAKE_CONFIGURATION : %CMAKE_CONFIGURATION%"
ECHO "============================================================="
ECHO "============================================================="
ECHO ""
ECHO "Running Build environment checks"
IF EXIST %LIBPATH%\ (
ECHO "LIBPATH ... Ok"
) ELSE (
ECHO "LIBPATH not found!"
exit 10;
)
IF EXIST %QT_INSTALL_PATH%\ (
ECHO "QT_INSTALL_PATH ... Ok"
) ELSE (
ECHO "QT_INSTALL_PATH: %QT_INSTALL_PATH%\ not found!"
exit 10;
)
echo %Time%: Entering rel directory ...
::enter build directory
cd rel
echo %Time%: Removing CMakeCache ...
::delete cmake cache
del /s /q CMakeCache.txt
echo %Time%: Removing CTestFile ...
del /q CTestTestfile.cmake
echo %Time%: Removing DartConfiguration ...
del /q DartConfiguration.tcl
echo %Time%: running cmake ...
::invoke cmake to fix paths
"C:\Program Files\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH_BASE%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DOPENFLIPPER_BUILD_UNIT_TESTS=TRUE %CMAKE_CONFIGURATION% ..
"C:\Program Files\Python39\python.exe" rel\tests\run_tests.py
IF %errorlevel% NEQ 0 exit /b %errorlevel%
::run tests
cd tests
copy ..\Build\Qt*.dll testBinaries
copy ..\Build\icu*.dll testBinaries
run_tests.bat
echo %Time%: Python ctest runner executed successfully with errorlevel: %errorlevel%
echo %Time%: At working directory: %CD%
cd ..
cd ..
IF %errorlevel% NEQ 0 exit /b %errorlevel%
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment