From 988ac88a15f1374679105dd348a388fd867404c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Sat, 13 Dec 2014 15:07:59 -0500 Subject: [PATCH] nitester & wrapper: compile nit and nitvm on the controller, and use nitc MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- contrib/nitester/src/nitester.nit | 3 +-- misc/jenkins/nitester-wrapper.sh | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/nitester/src/nitester.nit b/contrib/nitester/src/nitester.nit index 3431a86..1df1e3e 100644 --- a/contrib/nitester/src/nitester.nit +++ b/contrib/nitester/src/nitester.nit @@ -405,9 +405,8 @@ class Worker exec_and_check "git config remote.origin.fetch +refs/remotes/origin/pr/*:refs/remotes/origin/pr/*" exec_and_check "git fetch origin --quiet" exec_and_check "git checkout {branch_hash}" - exec_and_check "cp {remote_nit}/bin/nitg bin/" + exec_and_check "cp {remote_nit}/bin/* bin/" exec_and_check "src/git-gen-version.sh" - exec_and_check "bin/nitg --dir bin/ src/nit.nit src/nitvm.nit" end private fun exec_and_check(cmd: String) diff --git a/misc/jenkins/nitester-wrapper.sh b/misc/jenkins/nitester-wrapper.sh index c82f883..bb68a60 100755 --- a/misc/jenkins/nitester-wrapper.sh +++ b/misc/jenkins/nitester-wrapper.sh @@ -34,11 +34,12 @@ if ! git checkout $hash; then exit 1 fi -# Make nitg (quickly) +# Make basic bootstrap $tools_dir/unitrun.sh "run-make-csrc" make -C c_src $tools_dir/unitrun.sh "run-make-version" src/git-gen-version.sh -$tools_dir/unitrun.sh "run-make-nitg_0" c_src/nitg -o bin/nitg_0 src/nitg.nit -$tools_dir/unitrun.sh "run-make-nitg" bin/nitg_0 -o bin/nitg src/nitg.nit +$tools_dir/unitrun.sh "run-make-nitg_0" c_src/nitg -o bin/nitc_0 src/nitc.nit +$tools_dir/unitrun.sh "run-make-nitg" bin/nitc_0 --dir bin/ src/nitc.nit +$tools_dir/unitrun.sh "run-make-nit-and-nitvm" bin/nitc --dir bin/ src/nit.nit src/nitvm.nit # Make nitester $tools_dir/unitrun.sh "run-make-nitester" make -C contrib/nitester/ -- 1.7.9.5