Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More corrections to the batch testing tool to support testing 32-bit binaries on a 64-bit system. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
bd945366a4772f244a66d61872fe6578 |
| User & Date: | mistachkin 2014-01-31 00:28:42.204 |
Context
|
2014-01-31
| ||
| 00:48 | Correction to expected result for the test for ticket [72905c9a77]. check-in: 9854404773 user: mistachkin tags: trunk | |
| 00:28 | More corrections to the batch testing tool to support testing 32-bit binaries on a 64-bit system. check-in: bd945366a4 user: mistachkin tags: trunk | |
|
2014-01-30
| ||
| 14:00 | Limit the total number of threads used by the test for ticket [72905c9a77]. check-in: b93163fd6e user: mistachkin tags: trunk | |
Changes
Changes to Setup/test_all.bat.
| ︙ | ︙ | |||
106 107 108 109 110 111 112 113 114 115 116 117 118 119 | SET EAGLESHELL=EagleShell.exe ) ELSE ( SET EAGLESHELL=EagleShell32.exe ) %_VECHO% EagleShell = '%EAGLESHELL%' %__ECHO2% PUSHD "%ROOT%" IF ERRORLEVEL 1 ( ECHO Could not change directory to "%ROOT%". GOTO errors ) | > > > > > > > > > < < < < > > > > > > > > > | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 |
SET EAGLESHELL=EagleShell.exe
) ELSE (
SET EAGLESHELL=EagleShell32.exe
)
%_VECHO% EagleShell = '%EAGLESHELL%'
REM
REM NOTE: Set an environment variable that can be used by the test suite to
REM determine that testing is being performed in batch mode.
REM
REM HACK: If the SKIPMAIN environment variable is set, completely skip the
REM main loop. This allows callers to skip 64-bit testing and proceed
REM directly to 32-bit testing.
REM
IF NOT DEFINED SKIPMAIN (
%__ECHO2% PUSHD "%ROOT%"
IF ERRORLEVEL 1 (
ECHO Could not change directory to "%ROOT%".
GOTO errors
)
SET TEST_ALL=1
FOR %%C IN (%TEST_CONFIGURATIONS%) DO (
FOR %%Y IN (%YEARS%) DO (
IF EXIST "bin\%%Y\%%C\bin" (
IF DEFINED 32BITONLY (
%__ECHO% DEL /Q "bin\%%Y\%%C\bin\SQLite.Interop.*"
IF ERRORLEVEL 1 (
ECHO Failed to delete "bin\%%Y\%%C\bin\SQLite.Interop.*".
GOTO errors
)
)
IF NOT DEFINED NOMANAGEDONLY (
%__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" -anyInitialize "set test_year {%%Y}; set test_configuration {%%C}" -file "%TEST_FILE%"
IF ERRORLEVEL 1 (
ECHO Testing of "%%Y/%%C" managed-only assembly failed.
GOTO errors
)
|
| ︙ | ︙ | |||
226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 |
%__ECHO2% POPD
IF ERRORLEVEL 1 (
ECHO Could not restore directory.
GOTO errors
)
REM
REM NOTE: If this is a 64-bit machine and we have not already run the 32-bit
REM tests, do so now, unless we are forbidden from doing so.
REM
IF NOT DEFINED SKIP32BITONLY (
IF NOT DEFINED 32BITONLY (
IF /I NOT "%PROCESSOR_ARCHITECTURE%" == "x86" (
SET PLATFORM=Win32
SET 32BITONLY=1
GOTO redo
)
)
)
| > > > > > > > | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 |
%__ECHO2% POPD
IF ERRORLEVEL 1 (
ECHO Could not restore directory.
GOTO errors
)
)
REM
REM NOTE: If this is a 64-bit machine and we have not already run the 32-bit
REM tests, do so now, unless we are forbidden from doing so.
REM
IF NOT DEFINED SKIP32BITONLY (
IF NOT DEFINED 32BITONLY (
IF /I NOT "%PROCESSOR_ARCHITECTURE%" == "x86" (
REM
REM HACK: Always unset the SKIPMAIN environment variable so the primary
REM loop will run when only the 32-bit binaries are being tested.
REM
CALL :fn_UnsetVariable SKIPMAIN
SET PLATFORM=Win32
SET 32BITONLY=1
GOTO redo
)
)
)
|
| ︙ | ︙ |