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 | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
bd945366a4772f244a66d61872fe6578 |
| User & Date: | mistachkin 2014-01-31 00:28:42 |
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 106 SET EAGLESHELL=EagleShell.exe 107 107 ) ELSE ( 108 108 SET EAGLESHELL=EagleShell32.exe 109 109 ) 110 110 111 111 %_VECHO% EagleShell = '%EAGLESHELL%' 112 112 113 -%__ECHO2% PUSHD "%ROOT%" 114 - 115 -IF ERRORLEVEL 1 ( 116 - ECHO Could not change directory to "%ROOT%". 117 - GOTO errors 118 -) 119 - 120 113 REM 121 114 REM NOTE: Set an environment variable that can be used by the test suite to 122 115 REM determine that testing is being performed in batch mode. 123 116 REM 124 -SET TEST_ALL=1 117 +REM HACK: If the SKIPMAIN environment variable is set, completely skip the 118 +REM main loop. This allows callers to skip 64-bit testing and proceed 119 +REM directly to 32-bit testing. 120 +REM 121 +IF NOT DEFINED SKIPMAIN ( 122 + %__ECHO2% PUSHD "%ROOT%" 125 123 126 -FOR %%C IN (%TEST_CONFIGURATIONS%) DO ( 127 - FOR %%Y IN (%YEARS%) DO ( 128 - IF EXIST "bin\%%Y\%%C\bin" ( 129 - IF NOT DEFINED NOMANAGEDONLY ( 130 - %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" -anyInitialize "set test_year {%%Y}; set test_configuration {%%C}" -file "%TEST_FILE%" 124 + IF ERRORLEVEL 1 ( 125 + ECHO Could not change directory to "%ROOT%". 126 + GOTO errors 127 + ) 131 128 132 - IF ERRORLEVEL 1 ( 133 - ECHO Testing of "%%Y/%%C" managed-only assembly failed. 134 - GOTO errors 129 + SET TEST_ALL=1 130 + 131 + FOR %%C IN (%TEST_CONFIGURATIONS%) DO ( 132 + FOR %%Y IN (%YEARS%) DO ( 133 + IF EXIST "bin\%%Y\%%C\bin" ( 134 + IF DEFINED 32BITONLY ( 135 + %__ECHO% DEL /Q "bin\%%Y\%%C\bin\SQLite.Interop.*" 136 + 137 + IF ERRORLEVEL 1 ( 138 + ECHO Failed to delete "bin\%%Y\%%C\bin\SQLite.Interop.*". 139 + GOTO errors 140 + ) 141 + ) 142 + 143 + IF NOT DEFINED NOMANAGEDONLY ( 144 + %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" -anyInitialize "set test_year {%%Y}; set test_configuration {%%C}" -file "%TEST_FILE%" 145 + 146 + IF ERRORLEVEL 1 ( 147 + ECHO Testing of "%%Y/%%C" managed-only assembly failed. 148 + GOTO errors 149 + ) 135 150 ) 136 - ) 137 151 138 - IF EXIST "bin\%%Y\%PLATFORM%\%%C" ( 139 - IF NOT DEFINED NOMIXEDMODE ( 140 - IF NOT DEFINED NOXCOPY ( 141 - CALL :fn_CheckForLinq %%Y 152 + IF EXIST "bin\%%Y\%PLATFORM%\%%C" ( 153 + IF NOT DEFINED NOMIXEDMODE ( 154 + IF NOT DEFINED NOXCOPY ( 155 + CALL :fn_CheckForLinq %%Y 142 156 143 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\test.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 144 - 145 - IF ERRORLEVEL 1 ( 146 - ECHO Failed to copy "bin\%%Y\%%C\bin\test.*" to "bin\%%Y\%PLATFORM%\%%C". 147 - GOTO errors 148 - ) 149 - 150 - IF DEFINED HAVE_LINQ ( 151 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\System.Data.SQLite.Linq.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 157 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\test.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 152 158 153 159 IF ERRORLEVEL 1 ( 154 - ECHO Failed to copy "bin\%%Y\%%C\bin\System.Data.SQLite.Linq.*" to "bin\%%Y\%PLATFORM%\%%C". 160 + ECHO Failed to copy "bin\%%Y\%%C\bin\test.*" to "bin\%%Y\%PLATFORM%\%%C". 155 161 GOTO errors 156 162 ) 157 163 158 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\testlinq.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 164 + IF DEFINED HAVE_LINQ ( 165 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\System.Data.SQLite.Linq.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 166 + 167 + IF ERRORLEVEL 1 ( 168 + ECHO Failed to copy "bin\%%Y\%%C\bin\System.Data.SQLite.Linq.*" to "bin\%%Y\%PLATFORM%\%%C". 169 + GOTO errors 170 + ) 171 + 172 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\testlinq.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 173 + 174 + IF ERRORLEVEL 1 ( 175 + ECHO Failed to copy "bin\%%Y\%%C\bin\testlinq.*" to "bin\%%Y\%PLATFORM%\%%C". 176 + GOTO errors 177 + ) 178 + 179 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\northwindEF.db" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 180 + 181 + IF ERRORLEVEL 1 ( 182 + ECHO Failed to copy "bin\%%Y\%%C\bin\northwindEF.db" to "bin\%%Y\%PLATFORM%\%%C". 183 + GOTO errors 184 + ) 185 + ) 186 + 187 + IF DEFINED HAVE_EF6 ( 188 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\EntityFramework.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 189 + 190 + IF ERRORLEVEL 1 ( 191 + ECHO Failed to copy "bin\%%Y\%%C\bin\EntityFramework.*" to "bin\%%Y\%PLATFORM%\%%C". 192 + GOTO errors 193 + ) 194 + 195 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\System.Data.SQLite.EF6.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 196 + 197 + IF ERRORLEVEL 1 ( 198 + ECHO Failed to copy "bin\%%Y\%%C\bin\System.Data.SQLite.EF6.*" to "bin\%%Y\%PLATFORM%\%%C". 199 + GOTO errors 200 + ) 201 + 202 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\testef6.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 203 + 204 + IF ERRORLEVEL 1 ( 205 + ECHO Failed to copy "bin\%%Y\%%C\bin\testef6.*" to "bin\%%Y\%PLATFORM%\%%C". 206 + GOTO errors 207 + ) 208 + ) 209 + 210 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\SQLite.Designer.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 159 211 160 212 IF ERRORLEVEL 1 ( 161 - ECHO Failed to copy "bin\%%Y\%%C\bin\testlinq.*" to "bin\%%Y\%PLATFORM%\%%C". 213 + ECHO Failed to copy "bin\%%Y\%%C\bin\SQLite.Designer.*" to "bin\%%Y\%PLATFORM%\%%C". 162 214 GOTO errors 163 215 ) 164 216 165 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\northwindEF.db" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 217 + %__ECHO% XCOPY "bin\%%Y\%%C\bin\Installer.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 166 218 167 219 IF ERRORLEVEL 1 ( 168 - ECHO Failed to copy "bin\%%Y\%%C\bin\northwindEF.db" to "bin\%%Y\%PLATFORM%\%%C". 169 - GOTO errors 170 - ) 171 - ) 172 - 173 - IF DEFINED HAVE_EF6 ( 174 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\EntityFramework.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 175 - 176 - IF ERRORLEVEL 1 ( 177 - ECHO Failed to copy "bin\%%Y\%%C\bin\EntityFramework.*" to "bin\%%Y\%PLATFORM%\%%C". 178 - GOTO errors 179 - ) 180 - 181 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\System.Data.SQLite.EF6.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 182 - 183 - IF ERRORLEVEL 1 ( 184 - ECHO Failed to copy "bin\%%Y\%%C\bin\System.Data.SQLite.EF6.*" to "bin\%%Y\%PLATFORM%\%%C". 185 - GOTO errors 186 - ) 187 - 188 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\testef6.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 189 - 190 - IF ERRORLEVEL 1 ( 191 - ECHO Failed to copy "bin\%%Y\%%C\bin\testef6.*" to "bin\%%Y\%PLATFORM%\%%C". 220 + ECHO Failed to copy "bin\%%Y\%%C\bin\Installer.*" to "bin\%%Y\%PLATFORM%\%%C". 192 221 GOTO errors 193 222 ) 194 223 ) 195 224 196 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\SQLite.Designer.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 225 + %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" -preInitialize "set test_year {%%Y}; set test_configuration {%%C}" -initialize -runtimeOption native -file "%TEST_FILE%" 197 226 198 227 IF ERRORLEVEL 1 ( 199 - ECHO Failed to copy "bin\%%Y\%%C\bin\SQLite.Designer.*" to "bin\%%Y\%PLATFORM%\%%C". 200 - GOTO errors 201 - ) 202 - 203 - %__ECHO% XCOPY "bin\%%Y\%%C\bin\Installer.*" "bin\%%Y\%PLATFORM%\%%C" %FFLAGS% %DFLAGS% 204 - 205 - IF ERRORLEVEL 1 ( 206 - ECHO Failed to copy "bin\%%Y\%%C\bin\Installer.*" to "bin\%%Y\%PLATFORM%\%%C". 228 + ECHO Testing of "%%Y/%%C" mixed-mode assembly failed. 207 229 GOTO errors 208 230 ) 209 231 ) 210 - 211 - %__ECHO% "Externals\Eagle\bin\%EAGLESHELL%" -preInitialize "set test_year {%%Y}; set test_configuration {%%C}" -initialize -runtimeOption native -file "%TEST_FILE%" 212 - 213 - IF ERRORLEVEL 1 ( 214 - ECHO Testing of "%%Y/%%C" mixed-mode assembly failed. 215 - GOTO errors 216 - ) 232 + ) ELSE ( 233 + %_AECHO% Native directory "bin\%%Y\%PLATFORM%\%%C" not found, skipped. 217 234 ) 218 235 ) ELSE ( 219 - %_AECHO% Native directory "bin\%%Y\%PLATFORM%\%%C" not found, skipped. 236 + %_AECHO% Managed directory "bin\%%Y\%%C\bin" not found, skipped. 220 237 ) 221 - ) ELSE ( 222 - %_AECHO% Managed directory "bin\%%Y\%%C\bin" not found, skipped. 223 238 ) 224 239 ) 225 -) 226 240 227 -%__ECHO2% POPD 241 + %__ECHO2% POPD 228 242 229 -IF ERRORLEVEL 1 ( 230 - ECHO Could not restore directory. 231 - GOTO errors 243 + IF ERRORLEVEL 1 ( 244 + ECHO Could not restore directory. 245 + GOTO errors 246 + ) 232 247 ) 233 248 234 249 REM 235 250 REM NOTE: If this is a 64-bit machine and we have not already run the 32-bit 236 251 REM tests, do so now, unless we are forbidden from doing so. 237 252 REM 238 253 IF NOT DEFINED SKIP32BITONLY ( 239 254 IF NOT DEFINED 32BITONLY ( 240 255 IF /I NOT "%PROCESSOR_ARCHITECTURE%" == "x86" ( 256 + REM 257 + REM HACK: Always unset the SKIPMAIN environment variable so the primary 258 + REM loop will run when only the 32-bit binaries are being tested. 259 + REM 260 + CALL :fn_UnsetVariable SKIPMAIN 261 + 241 262 SET PLATFORM=Win32 242 263 SET 32BITONLY=1 243 264 GOTO redo 244 265 ) 245 266 ) 246 267 ) 247 268