Skip to content

Commit d7f19a3

Browse files
committed
Fix 'jenkins.testone.cmd ... -disablejit' path to use the correct _BinDir. Unblocks ref chakra-core#114.
1 parent 35663e1 commit d7f19a3

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.user
77
*.i
88
Build/VCBuild/
9+
Build/VCBuild.NoJIT/
910
Build/ipch/
1011
Build/.vs/
1112
build_*.log

test/jenkins.parsetestargs.cmd

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ if not "%1"=="" (
5151
goto :ContinueArgParse
5252
)
5353

54+
if "%1"=="-disablejit" (
55+
set _NoJIT=.NoJIT
56+
REM fallthrough to default (also add this to %_ExtraTestArgs%)
57+
)
58+
5459
:: default
5560
set _ExtraTestArgs=%_ExtraTestArgs% %1
5661
shift

test/jenkins.testone.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
setlocal
3030

3131
set _RootDir=%~dp0..
32-
set _BinDir=%_RootDir%\Build\VcBuild\bin
3332
set _HadFailures=0
3433

3534
:: ============================================================================
@@ -48,6 +47,7 @@ set _HadFailures=0
4847
call jenkins.parsetestargs.cmd %*
4948
set _LogDir=%_TestDir%\logs\%_TestArch%_%_TestType%
5049
set _TestArgs=%_TestArch%%_TestType%
50+
set _BinDir=%_RootDir%\Build\VcBuild%_NoJIT%\bin
5151

5252
call :doSilent rd /s/q %_LogDir%
5353

0 commit comments

Comments
 (0)