2
0
Эх сурвалжийг харах

Fixes relative paths in jenkins scripts after move

Fixes up the relative path usage in the jenkins scripts and the
netci.groovy file after moving the jenkins script files to the jenkins
subdirectory.
Ian Halliday 10 жил өмнө
parent
commit
0746d49b81

+ 1 - 1
jenkins/buildall.cmd

@@ -7,6 +7,6 @@
 setlocal
 
 set JENKINS_BUILD=True
-call test\jenkins.buildall.cmd %*
+call %~dp0..\test\jenkins.buildall.cmd %*
 
 endlocal

+ 1 - 1
jenkins/buildone.cmd

@@ -32,7 +32,7 @@ if "%2"=="" (
 :main
 
     set JENKINS_BUILD=True
-    call test\jenkins.buildone.cmd %*
+    call %~dp0..\test\jenkins.buildone.cmd %*
 
     goto :end
 

+ 2 - 2
jenkins/check_copyright.sh

@@ -12,7 +12,7 @@ if [ $? -ne 0 ]; then
     PATH=/bin:/usr/bin:$PATH
 fi
 
-ERRFILE=jenkins.check_copyright.sh.err
+ERRFILE=check_copyright.sh.err
 ERRFILETEMP=$ERRFILE.0
 rm -f $ERRFILE
 rm -f $ERRFILETEMP
@@ -32,7 +32,7 @@ git diff --name-only `git merge-base origin/master HEAD` HEAD |
     grep -v -E '\.def$' |
     grep -v -E '\.inc$' |
     grep -v -E 'test/benchmarks/.*\.js$' |
-    xargs -I % sh -c "echo 'Check Copyright > Checking %'; python jenkins.check_copyright.py % > $ERRFILETEMP || cat $ERRFILETEMP >> $ERRFILE"
+    xargs -I % sh -c "echo 'Check Copyright > Checking %'; python jenkins/check_copyright.py % > $ERRFILETEMP || cat $ERRFILETEMP >> $ERRFILE"
 
 if [ -e $ERRFILE ]; then # if error file exists then there were errors
     >&2 echo "--------------" # leading >&2 means echo to stderr

+ 2 - 2
jenkins/check_eol.sh

@@ -12,10 +12,10 @@ if [ $? -ne 0 ]; then
     PATH=/bin:/usr/bin:$PATH
 fi
 
-ERRFILE=jenkins.check_eol.sh.err
+ERRFILE=check_eol.sh.err
 rm -f $ERRFILE
 
-git diff --name-only `git merge-base origin/master HEAD` HEAD | grep -v -E "(test/.*\\.js|\\.cmd|\\.baseline)" | xargs -I % ./jenkins.check_file_eol.sh %
+git diff --name-only `git merge-base origin/master HEAD` HEAD | grep -v -E "(test/.*\\.js|\\.cmd|\\.baseline)" | xargs -I % ./jenkins/check_file_eol.sh %
 
 if [ -e $ERRFILE ]; then # if error file exists then there were errors
     >&2 echo "--------------" # leading >&2 means echo to stderr

+ 1 - 1
jenkins/check_file_eol.sh

@@ -6,7 +6,7 @@
 # We will run dos2unix on the argument and make sure that it doesn't change.
 # If it changes, that means someone introduced a CRLF by not setting core.autocrlf to true.
 
-ERRFILE=jenkins.check_eol.sh.err
+ERRFILE=check_eol.sh.err
 ERRFILETEMP=$ERRFILE.0
 
 # display a helpful message for someone reading the log

+ 1 - 1
jenkins/testall.cmd

@@ -7,6 +7,6 @@
 setlocal
 
 set JENKINS_BUILD=True
-call test\jenkins.testall.cmd %*
+call %~dp0..\test\jenkins.testall.cmd %*
 
 endlocal

+ 1 - 1
jenkins/testone.cmd

@@ -24,7 +24,7 @@ if "%2"=="" (
 :main
 
     set JENKINS_BUILD=True
-    call test\jenkins.testone.cmd %*
+    call %~dp0..\test\jenkins.testone.cmd %*
 
     goto :end
 

+ 4 - 4
netci.groovy

@@ -38,10 +38,10 @@ def CreateBuildTasks = { machine, configTag, buildExtra, testExtra, excludeConfi
                 def testableConfig = buildType in ['debug', 'test'] && buildArch != 'arm'
                 def analysisConfig = buildType in ['release']
 
-                def buildScript = "call jenkins.buildone.cmd ${buildArch} ${buildType}"
+                def buildScript = "call .\\jenkins\\buildone.cmd ${buildArch} ${buildType}"
                 buildScript += buildExtra ?: ''
                 buildScript += analysisConfig ? ' "/p:runcodeanalysis=true"' : ''
-                def testScript = "call jenkins.testone.cmd ${buildArch} ${buildType}"
+                def testScript = "call .\\jenkins\\testone.cmd ${buildArch} ${buildType}"
                 testScript += testExtra ?: ''
                 def analysisScript = ".\\Build\\scripts\\check_prefast_error.ps1 . CodeAnalysis.err"
 
@@ -163,5 +163,5 @@ CreateBuildTasks('Windows_NT', 'daily_disablejit', ' "/p:BuildJIT=false"', ' -di
 // CODE STYLE TASKS
 // ----------------
 
-CreateStyleCheckTasks('./jenkins.check_eol.sh', 'ubuntu_check_eol', 'EOL Check')
-CreateStyleCheckTasks('./jenkins.check_copyright.sh', 'ubuntu_check_copyright', 'Copyright Check')
+CreateStyleCheckTasks('./jenkins/check_eol.sh', 'ubuntu_check_eol', 'EOL Check')
+CreateStyleCheckTasks('./jenkins/check_copyright.sh', 'ubuntu_check_copyright', 'Copyright Check')