Commit d1eaa42f authored by Magnus Hagander's avatar Magnus Hagander

Add extra checks for buildfarm to pick up errors when running

on XP or earlier versions of Windows.

Andrew Dunstan
parent a03e8ad2
@echo off @echo off
REM $PostgreSQL: pgsql/src/tools/msvc/build.bat,v 1.8 2007/04/18 10:14:06 mha Exp $ REM $PostgreSQL: pgsql/src/tools/msvc/build.bat,v 1.9 2007/06/26 11:43:56 mha Exp $
SETLOCAL SETLOCAL
SET STARTDIR=%CD% SET STARTDIR=%CD%
...@@ -32,4 +32,6 @@ SET E=%ERRORLEVEL% ...@@ -32,4 +32,6 @@ SET E=%ERRORLEVEL%
cd %STARTDIR% cd %STARTDIR%
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" exit %E%
exit /b %E% exit /b %E%
@echo off @echo off
REM $PostgreSQL: pgsql/src/tools/msvc/install.bat,v 1.1 2007/05/01 20:11:14 mha Exp $ REM $PostgreSQL: pgsql/src/tools/msvc/install.bat,v 1.2 2007/06/26 11:43:56 mha Exp $
if NOT "%1"=="" GOTO RUN_INSTALL if NOT "%1"=="" GOTO RUN_INSTALL
echo Invalid command line options. echo Invalid command line options.
echo Usage: "install.bat <path>" echo Usage: "install.bat <path>"
echo. echo.
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" exit 1
exit /b 1 exit /b 1
:RUN_INSTALL :RUN_INSTALL
...@@ -15,4 +17,6 @@ if exist buildenv.bat call buildenv.bat ...@@ -15,4 +17,6 @@ if exist buildenv.bat call buildenv.bat
perl install.pl "%1" perl install.pl "%1"
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" exit %ERRORLEVEL%
exit /b %ERRORLEVEL% exit /b %ERRORLEVEL%
@echo off @echo off
REM $PostgreSQL: pgsql/src/tools/msvc/vcregress.bat,v 1.12 2007/06/12 11:07:34 mha Exp $ REM $PostgreSQL: pgsql/src/tools/msvc/vcregress.bat,v 1.13 2007/06/26 11:43:56 mha Exp $
SETLOCAL SETLOCAL
SET STARTDIR=%CD% SET STARTDIR=%CD%
...@@ -32,6 +32,8 @@ IF NOT "%2"=="" SET SCHEDULE=%2 ...@@ -32,6 +32,8 @@ IF NOT "%2"=="" SET SCHEDULE=%2
IF "%what%"=="ECPGCHECK" ( IF "%what%"=="ECPGCHECK" (
cd "%STARTDIR%" cd "%STARTDIR%"
msbuild ecpg_regression.proj /p:config=%CONFIG% msbuild ecpg_regression.proj /p:config=%CONFIG%
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" if errorlevel 1 exit 1
if errorlevel 1 exit /b 1 if errorlevel 1 exit /b 1
cd "%TOPDIR%" cd "%TOPDIR%"
cd src\interfaces\ecpg\test cd src\interfaces\ecpg\test
...@@ -48,6 +50,8 @@ if "%what%"=="CONTRIBCHECK" call :contribcheck ...@@ -48,6 +50,8 @@ if "%what%"=="CONTRIBCHECK" call :contribcheck
SET E=%ERRORLEVEL% SET E=%ERRORLEVEL%
cd "%STARTDIR%" cd "%STARTDIR%"
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" exit %E%
exit /b %E% exit /b %E%
:usage :usage
...@@ -61,8 +65,11 @@ REM Some workarounds due to inconsistently named directories ...@@ -61,8 +65,11 @@ REM Some workarounds due to inconsistently named directories
cd ..\..\PL cd ..\..\PL
FOR /D %%d IN (*) do if exist %%d\sql if exist %%d\expected ( FOR /D %%d IN (*) do if exist %%d\sql if exist %%d\expected (
if exist ..\..\%CONFIG%\%%d call :oneplcheck %%d if exist ..\..\%CONFIG%\%%d call :oneplcheck %%d
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" if errorlevel 1 exit 1
if errorlevel 1 exit /b 1 if errorlevel 1 exit /b 1
if exist ..\..\%CONFIG%\pl%%d call :oneplcheck %%d if exist ..\..\%CONFIG%\pl%%d call :oneplcheck %%d
if "%XP_EXIT_FIX%" == "yes" if errorlevel 1 exit 1
if errorlevel 1 exit /b 1 if errorlevel 1 exit /b 1
) )
goto :eof goto :eof
...@@ -83,6 +90,8 @@ del regress.tmp.bat ...@@ -83,6 +90,8 @@ del regress.tmp.bat
..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir=..\..\..\%CONFIG%\psql --no-locale --load-language=%PL% %TESTS% ..\..\..\%CONFIG%\pg_regress\pg_regress --psqldir=..\..\..\%CONFIG%\psql --no-locale --load-language=%PL% %TESTS%
set E=%ERRORLEVEL% set E=%ERRORLEVEL%
cd .. cd ..
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" exit %E%
exit /b %E% exit /b %E%
...@@ -94,6 +103,8 @@ for /d %%d IN (*) do if exist %%d\sql if exist %%d\expected if exist %%d\Makefil ...@@ -94,6 +103,8 @@ for /d %%d IN (*) do if exist %%d\sql if exist %%d\expected if exist %%d\Makefil
call :onecontribcheck %%d call :onecontribcheck %%d
if errorlevel 1 set CONTRIBERROR=1 if errorlevel 1 set CONTRIBERROR=1
) )
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" if %CONTRIBERROR%==1 exit 1
if %CONTRIBERROR%==1 exit /b 1 if %CONTRIBERROR%==1 exit /b 1
goto :eof goto :eof
...@@ -110,4 +121,6 @@ del regress.tmp.bat ...@@ -110,4 +121,6 @@ del regress.tmp.bat
..\..\%CONFIG%\pg_regress\pg_regress --psqldir=..\..\%CONFIG%\psql --no-locale --dbname=contrib_regression %TESTS% ..\..\%CONFIG%\pg_regress\pg_regress --psqldir=..\..\%CONFIG%\psql --no-locale --dbname=contrib_regression %TESTS%
set E=%ERRORLEVEL% set E=%ERRORLEVEL%
cd .. cd ..
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" exit %E%
exit /b %E% exit /b %E%
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