]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: helpers to run make check in containers
authorLoic Dachary <ldachary@redhat.com>
Sun, 21 Dec 2014 09:01:59 +0000 (10:01 +0100)
committerLoic Dachary <ldachary@redhat.com>
Sun, 21 Dec 2014 16:53:00 +0000 (17:53 +0100)
Add scripts that run make check in a container for a given operating
system version. They are a little more than oneliners and serve two
purposes:

  * help new developers who do not have to figure out which options
    should be used

  * run make check in containers in parallel with make -j2

Signed-off-by: Loic Dachary <ldachary@redhat.com>
src/test/Makefile.am
src/test/container-make-check-centos-centos7.sh [new file with mode: 0755]
src/test/container-make-check-ubuntu-14.04.sh [new file with mode: 0755]

index 175731e7f56bad90ada037042b728d8acfe16604..56fc9ead390f1031ca09c86fa3fe4bba8cba0e95 100644 (file)
@@ -268,6 +268,14 @@ EXTRA_DIST += \
         $(srcdir)/test/coverage.sh \
        $(patsubst %,$(srcdir)/%,$(check_SCRIPTS))
 
+docker-check:
+       $(srcdir)/test/container-make-check-ubuntu-14.04.sh
+       $(srcdir)/test/container-make-check-centos-centos7.sh
+
+EXTRA_DIST += \
+       $(srcdir)/test/container-make-check-ubuntu-14.04.sh
+       $(srcdir)/test/container-make-check-centos-centos7.sh
+
 # target to build but not run the unit tests
 unittests:: $(check_PROGRAMS)
 
diff --git a/src/test/container-make-check-centos-centos7.sh b/src/test/container-make-check-centos-centos7.sh
new file mode 100755 (executable)
index 0000000..5e718d0
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/bash
+source test/docker-test-helper.sh
+main_docker "$@" --os-type centos --os-version centos7 --dev -- ./run-make-check.sh --enable-root-make-check
diff --git a/src/test/container-make-check-ubuntu-14.04.sh b/src/test/container-make-check-ubuntu-14.04.sh
new file mode 100755 (executable)
index 0000000..d9eaa2f
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/bash
+source test/docker-test-helper.sh
+main_docker "$@" --os-type ubuntu --os-version 14.04 --dev -- ./run-make-check.sh --enable-root-make-check