Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | @echo off |
michael@0 | 2 | REM ******************************************************************** |
michael@0 | 3 | REM * COPYRIGHT: |
michael@0 | 4 | REM * Copyright (c) 2010-2012, International Business Machines Corporation |
michael@0 | 5 | REM * and others. All Rights Reserved. |
michael@0 | 6 | REM ******************************************************************** |
michael@0 | 7 | |
michael@0 | 8 | set ICU_ARCH=%1 |
michael@0 | 9 | set ICU_DBRL=%2 |
michael@0 | 10 | |
michael@0 | 11 | if "%1" == "" ( |
michael@0 | 12 | echo Usage: %0 "x86 or x64" "Debug or Release" |
michael@0 | 13 | exit /b 1 |
michael@0 | 14 | ) |
michael@0 | 15 | |
michael@0 | 16 | if "%2" == "" ( |
michael@0 | 17 | echo Usage: %0 %1 "Debug or Release" |
michael@0 | 18 | exit /b 1 |
michael@0 | 19 | ) |
michael@0 | 20 | |
michael@0 | 21 | set ICU_OPATH=%PATH% |
michael@0 | 22 | |
michael@0 | 23 | set ICU_ICUDIR="%~dp0"\..\.. |
michael@0 | 24 | |
michael@0 | 25 | if "%ICU_ARCH%" == "x64" ( |
michael@0 | 26 | set ICU_BINDIR=%~dp0\..\..\bin64 |
michael@0 | 27 | ) else ( |
michael@0 | 28 | set ICU_BINDIR=%~dp0\..\..\bin |
michael@0 | 29 | ) |
michael@0 | 30 | |
michael@0 | 31 | set PATH=%ICU_BINDIR%;%PATH% |
michael@0 | 32 | |
michael@0 | 33 | echo testing ICU in %ICU_ICUDIR% arch=%ICU_ARCH% type=%ICU_DBRL% |
michael@0 | 34 | pushd %ICU_ICUDIR% |
michael@0 | 35 | |
michael@0 | 36 | @rem factor these out |
michael@0 | 37 | set ICUINFO_CMD=%ICU_ICUDIR%\source\tools\icuinfo\%ICU_ARCH%\%ICU_DBRL%\icuinfo.exe |
michael@0 | 38 | set INTLTEST_CMD=%ICU_ICUDIR%\source\test\intltest\%ICU_ARCH%\%ICU_DBRL%\intltest.exe |
michael@0 | 39 | set IOTEST_CMD=%ICU_ICUDIR%\source\test\iotest\%ICU_ARCH%\%ICU_DBRL%\iotest.exe |
michael@0 | 40 | set CINTLTST_CMD=%ICU_ICUDIR%\source\test\cintltst\%ICU_ARCH%\%ICU_DBRL%\cintltst.exe |
michael@0 | 41 | set LETEST_CMD=%ICU_ICUDIR%\source\test\letest\%ICU_ARCH%\%ICU_DBRL%\letest.exe |
michael@0 | 42 | |
michael@0 | 43 | set ICUFAILED= |
michael@0 | 44 | set ICURUN= |
michael@0 | 45 | set ICUFAILCNT=0 |
michael@0 | 46 | |
michael@0 | 47 | @echo on |
michael@0 | 48 | |
michael@0 | 49 | @set THT=icuinfo |
michael@0 | 50 | @echo ==== %THT% ========================================================================= |
michael@0 | 51 | %ICUINFO_CMD% %ICUINFO_OPTS% |
michael@0 | 52 | |
michael@0 | 53 | @IF NOT ERRORLEVEL 1 GOTO OK_%THT% |
michael@0 | 54 | @set ICUFAILED=%ICUFAILED% %THT% |
michael@0 | 55 | @set ICUFAILCNT=1 |
michael@0 | 56 | :OK_icuinfo |
michael@0 | 57 | @set ICURUN=%ICURUN% %THT% |
michael@0 | 58 | |
michael@0 | 59 | @set THT=intltest |
michael@0 | 60 | @echo ==== %THT% ========================================================================= |
michael@0 | 61 | @cd %ICU_ICUDIR%\source\test\intltest |
michael@0 | 62 | %INTLTEST_CMD% %INTLTEST_OPTS% |
michael@0 | 63 | |
michael@0 | 64 | @IF NOT ERRORLEVEL 1 GOTO OK_%THT% |
michael@0 | 65 | @set ICUFAILED=%ICUFAILED% %THT% |
michael@0 | 66 | @set ICUFAILCNT=1 |
michael@0 | 67 | :OK_intltest |
michael@0 | 68 | @set ICURUN=%ICURUN% %THT% |
michael@0 | 69 | |
michael@0 | 70 | @set THT=iotest |
michael@0 | 71 | @echo ==== %THT% ========================================================================= |
michael@0 | 72 | @cd %ICU_ICUDIR%\source\test\iotest |
michael@0 | 73 | %IOTEST_CMD% %IOTEST_OPTS% |
michael@0 | 74 | |
michael@0 | 75 | @IF NOT ERRORLEVEL 1 GOTO OK_%THT% |
michael@0 | 76 | @set ICUFAILED=%ICUFAILED% %THT% |
michael@0 | 77 | @set ICUFAILCNT=1 |
michael@0 | 78 | :OK_IOTEST |
michael@0 | 79 | @set ICURUN=%ICURUN% %THT% |
michael@0 | 80 | |
michael@0 | 81 | @set THT=cintltst |
michael@0 | 82 | @echo ==== %THT% ========================================================================= |
michael@0 | 83 | @cd %ICU_ICUDIR%\source\test\cintltst |
michael@0 | 84 | %CINTLTST_CMD% %CINTLTST_OPTS% |
michael@0 | 85 | |
michael@0 | 86 | @IF NOT ERRORLEVEL 1 GOTO OK_%THT% |
michael@0 | 87 | @set ICUFAILED=%ICUFAILED% %THT% |
michael@0 | 88 | @set ICUFAILCNT=1 |
michael@0 | 89 | :OK_cintltst |
michael@0 | 90 | @set ICURUN=%ICURUN% %THT% |
michael@0 | 91 | |
michael@0 | 92 | @set THT=letest |
michael@0 | 93 | @echo ==== %THT% ========================================================================= |
michael@0 | 94 | @cd %ICU_ICUDIR%\source\test\letest |
michael@0 | 95 | %LETST_CMD% %LETEST_OPTS% |
michael@0 | 96 | |
michael@0 | 97 | @IF NOT ERRORLEVEL 1 GOTO OK_%THT% |
michael@0 | 98 | @set ICUFAILED=%ICUFAILED% %THT% |
michael@0 | 99 | @set ICUFAILCNT=1 |
michael@0 | 100 | :OK_letest |
michael@0 | 101 | @set ICURUN=%ICURUN% %THT% |
michael@0 | 102 | |
michael@0 | 103 | @echo off |
michael@0 | 104 | |
michael@0 | 105 | REM clean up |
michael@0 | 106 | set PATH=%ICU_OPATH% |
michael@0 | 107 | REM unset ICU_OPATH |
michael@0 | 108 | popd |
michael@0 | 109 | |
michael@0 | 110 | @REM done |
michael@0 | 111 | |
michael@0 | 112 | echo - |
michael@0 | 113 | echo - |
michael@0 | 114 | echo - |
michael@0 | 115 | echo ============================================================ |
michael@0 | 116 | echo Summary: ICU in %ICU_ICUDIR% arch=%ICU_ARCH% type=%ICU_DBRL% |
michael@0 | 117 | echo - |
michael@0 | 118 | echo Tests Run : %ICURUN% |
michael@0 | 119 | |
michael@0 | 120 | if %ICUFAILCNT% == 0 ( |
michael@0 | 121 | echo " - All Passed!" |
michael@0 | 122 | exit /b 0 |
michael@0 | 123 | ) |
michael@0 | 124 | echo Failing Tests: %ICUFAILED% |
michael@0 | 125 | echo - |
michael@0 | 126 | echo FAILED! |
michael@0 | 127 | |
michael@0 | 128 | exit /b 1 |