[zorg] r317597 - jenkins/jobs: Fix more LNT flags
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Tue Nov 7 10:26:27 PST 2017
Author: matze
Date: Tue Nov 7 10:26:27 2017
New Revision: 317597
URL: http://llvm.org/viewvc/llvm-project?rev=317597&view=rev
Log:
jenkins/jobs: Fix more LNT flags
Now that the typo in the task invocation was fixed more typos in the
cmake cache selection showed up.
Modified:
zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O0-g
zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O3-flto
zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Os
zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Oz
zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-O3-flto
zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-Os-flto
zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O0-g
zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O3
zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-globalisel-O0-g
zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O0-g
zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O3
zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64h-O3
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O0-g
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O0-g?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O0-g (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O0-g Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-04') {
sh """
-LNT_FLAGS+=" -C config/zorg/tasks/cmake/caches/target-arm64-iphoneos.cmake"
-LNT_FLAGS+=" -C config/zorg/tasks/cmake/caches/opt-O0-g.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-arm64-iphoneos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O0-g.cmake"
config/tasks/task jenkinsrun config/tasks/lnt-ctmark.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O3-flto
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O3-flto?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O3-flto (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-O3-flto Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-04') {
sh """
-LNT_FLAGS+=" -C config/zorg/tasks/cmake/caches/target-arm64-iphoneos.cmake"
-LNT_FLAGS+=" -C config/zorg/tasks/cmake/caches/opt-O3-flto.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-arm64-iphoneos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O3-flto.cmake"
config/tasks/task jenkinsrun config/tasks/lnt-ctmark.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Os
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Os?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Os (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Os Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-06') {
sh """
-LNT_FLAGS+=" -C config/zorg/tasks/cmake/caches/target-arm64-iphoneos.cmake"
-LNT_FLAGS+=" -C config/zorg/tasks/cmake/caches/opt-Os.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-arm64-iphoneos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-Os.cmake"
config/tasks/task jenkinsrun config/tasks/lnt-ctmark.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Oz
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Oz?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Oz (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lnt-ctmark-aarch64-Oz Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-06') {
sh """
-LNT_FLAGS+=" -C config/zorg/tasks/cmake/caches/target-arm64-iphoneos.cmake"
-LNT_FLAGS+=" -C config/zorg/tasks/cmake/caches/opt-Oz.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-arm64-iphoneos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-Oz.cmake"
config/tasks/task jenkinsrun config/tasks/lnt-ctmark.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-O3-flto
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-O3-flto?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-O3-flto (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-O3-flto Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-06') {
sh """
-LNT_FLAGS+=" -C \${WORKSPACE}/zorg/tasks/cmake/caches/target-x86_64-macosx.cmake"
-LNT_FLAGS+=" -C \${WORKSPACE}/zorg/tasks/cmake/caches/opt-O3-flto.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-x86_64-macosx.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O3-flto.cmake"
config/tasks/task jenkinsrun config/tasks/lnt-test-suite.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-Os-flto
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-Os-flto?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-Os-flto (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/lnt-test-suite-x86_64-Os-flto Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-07') {
sh """
-LNT_FLAGS+=" -C \${WORKSPACE}/zorg/tasks/cmake/caches/target-x86_64-macosx.cmake"
-LNT_FLAGS+=" -C \${WORKSPACE}/zorg/tasks/cmake/caches/opt-Os-flto.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-x86_64-macosx.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-Os-flto.cmake"
config/tasks/task jenkinsrun config/tasks/lnt-test-suite.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O0-g
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O0-g?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O0-g (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O0-g Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-12') {
sh """
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/target-arm64-iphoneos.cmake"
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/opt-O0-g.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-arm64-iphoneos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O0-g.cmake"
config/tasks/task jenkinsrun config/tasks/test-suite-verify-machineinstrs.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O3
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O3?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O3 (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-O3 Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-12') {
sh """
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/target-arm64-iphoneos.cmake"
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/opt-O3-g.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-arm64-iphoneos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O3-g.cmake"
config/tasks/task jenkinsrun config/tasks/test-suite-verify-machineinstrs.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-globalisel-O0-g
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-globalisel-O0-g?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-globalisel-O0-g (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-aarch64-globalisel-O0-g Tue Nov 7 10:26:27 2017
@@ -2,9 +2,9 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-21') {
sh """
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/target-arm64-iphoneos.cmake"
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/opt-O0-g.cmake"
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/global-isel.cmake.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-arm64-iphoneos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O0-g.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/global-isel.cmake.cmake"
config/tasks/task jenkinsrun config/tasks/test-suite-verify-machineinstrs.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O0-g
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O0-g?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O0-g (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O0-g Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-12') {
sh """
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/target-x86_64-macos.cmake"
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/opt-O0-g.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-x86_64-macos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O0-g.cmake"
config/tasks/task jenkinsrun config/tasks/test-suite-verify-machineinstrs.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O3
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O3?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O3 (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64-O3 Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-12') {
sh """
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/target-x86_64-macos.cmake"
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/opt-O3.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-x86_64-macos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O3.cmake"
config/tasks/task jenkinsrun config/tasks/test-suite-verify-machineinstrs.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
Modified: zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64h-O3
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64h-O3?rev=317597&r1=317596&r2=317597&view=diff
==============================================================================
--- zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64h-O3 (original)
+++ zorg/trunk/zorg/jenkins/jobs/jobs/test-suite-verify-machineinstrs-x86_64h-O3 Tue Nov 7 10:26:27 2017
@@ -2,8 +2,8 @@
def benchmark = evaluate readTrusted('zorg/jenkins/benchmark.groovy')
benchmark.testsuite_pipeline(label: 'green-dragon-12') {
sh """
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/target-x86_64h-macos.cmake"
-LNT_FLAGS+=" -C zorg/tasks/cmake/caches/opt-O3.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/target-x86_64h-macos.cmake"
+LNT_FLAGS+=" -C config/tasks/cmake/caches/opt-O3.cmake"
config/tasks/task jenkinsrun config/tasks/test-suite-verify-machineinstrs.sh -a compiler="${params.ARTIFACT}" -D LNT_FLAGS="\${LNT_FLAGS}"
"""
}
More information about the llvm-commits
mailing list