[CRIU] [PATCH 1/2] travis: build tests in a separate job

Andrey Vagin avagin at openvz.org
Thu Jul 7 16:18:52 PDT 2016


From: Andrew Vagin <avagin at virtuozzo.com>

Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
---
 .travis.yml                       | 4 ++--
 scripts/travis/Makefile           | 4 ++++
 scripts/{ => travis}/travis-tests | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 scripts/travis/Makefile
 rename scripts/{ => travis}/travis-tests (96%)

diff --git a/.travis.yml b/.travis.yml
index b661a45..aa5e694 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,13 @@ dist: trusty
 services:
   - docker
 env:
+  - TR_ARCH=local
   - TR_ARCH=x86_64
   - TR_ARCH=armv7hf
   - TR_ARCH=aarch64
   - TR_ARCH=ppc64le
 script:
-  - sudo make -C scripts/build $TR_ARCH
-  - sudo ./scripts/travis-tests $TR_ARCH
+  - sudo make -C scripts/travis $TR_ARCH
 after_success:
   - sudo apt-get install -qq -y lcov
   - gem install coveralls-lcov
diff --git a/scripts/travis/Makefile b/scripts/travis/Makefile
new file mode 100644
index 0000000..9b7361b
--- /dev/null
+++ b/scripts/travis/Makefile
@@ -0,0 +1,4 @@
+local:
+	./travis-tests
+%:
+	$(MAKE) -C ../build $@
diff --git a/scripts/travis-tests b/scripts/travis/travis-tests
similarity index 96%
rename from scripts/travis-tests
rename to scripts/travis/travis-tests
index c45ec52..1df741a 100755
--- a/scripts/travis-tests
+++ b/scripts/travis/travis-tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -x -e
 
-test "$1" = "x86_64" || exit 0
+cd ../../
 
 apt-get update -qq
 apt-get install -qq protobuf-c-compiler libprotobuf-c0-dev libaio-dev	\
-- 
2.7.4



More information about the CRIU mailing list