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 | SET EAGLESHELL=EagleShell.exe ) ELSE ( SET EAGLESHELL=EagleShell32.exe ) %_VECHO% EagleShell = '%EAGLESHELL%' | > > > > > > > > > | | | | | < < < < | | | | > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > | 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 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 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 | 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 ) ) IF EXIST "bin\%%Y\%PLATFORM%\%%C" ( IF NOT DEFINED NOMIXEDMODE ( IF NOT DEFINED NOXCOPY ( CALL :fn_CheckForLinq %%Y %__ECHO% XCOPY "bin\%%Y\%%C\bin\test.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\test.*" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) IF DEFINED HAVE_LINQ ( %__ECHO% XCOPY "bin\%%Y\%%C\bin\System.Data.SQLite.Linq.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\System.Data.SQLite.Linq.*" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) %__ECHO% XCOPY "bin\%%Y\%%C\bin\testlinq.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\testlinq.*" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) %__ECHO% XCOPY "bin\%%Y\%%C\bin\northwindEF.db" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\northwindEF.db" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) ) IF DEFINED HAVE_EF6 ( %__ECHO% XCOPY "bin\%%Y\%%C\bin\EntityFramework.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\EntityFramework.*" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) %__ECHO% XCOPY "bin\%%Y\%%C\bin\System.Data.SQLite.EF6.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\System.Data.SQLite.EF6.*" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) %__ECHO% XCOPY "bin\%%Y\%%C\bin\testef6.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\testef6.*" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) ) %__ECHO% XCOPY "bin\%%Y\%%C\bin\SQLite.Designer.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\SQLite.Designer.*" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) %__ECHO% XCOPY "bin\%%Y\%%C\bin\Installer.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% IF ERRORLEVEL 1 ( ECHO Failed to copy "bin\%%Y\%%C\bin\Installer.*" to "bin\%%Y\%PLATFORM%\%%C". GOTO errors ) ) %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" -preInitialize "set test_year {%%Y}; set test_configuration {%%C}" -initialize -runtimeOption native -file "%TEST_FILE%" IF ERRORLEVEL 1 ( ECHO Testing of "%%Y/%%C" mixed-mode assembly failed. GOTO errors ) ) ) ELSE ( %_AECHO% Native directory "bin\%%Y\%PLATFORM%\%%C" not found, skipped. ) ) ELSE ( %_AECHO% Managed directory "bin\%%Y\%%C\bin" not found, skipped. ) ) ) %__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 ) ) ) |
︙ | ︙ |