summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpodman/testdata/testscript.sh8
-rwxr-xr-xrun-tests.sh3
2 files changed, 8 insertions, 3 deletions
diff --git a/podman/testdata/testscript.sh b/podman/testdata/testscript.sh
index a5b1b2f..4e191b9 100755
--- a/podman/testdata/testscript.sh
+++ b/podman/testdata/testscript.sh
@@ -3,6 +3,10 @@
set -e
git clone /data/git git
cd git
-#python3 -m pytest --workers auto
-python3 -m pytest -x
+
+if [ $# -ge 1 -a "$1" = "--parallel" ]; then
+ python3 -m pytest --workers auto
+else
+ python3 -m pytest -x
+fi
diff --git a/run-tests.sh b/run-tests.sh
index 50af316..76be006 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,6 +1,7 @@
#!/bin/sh
set -e
+CONTAINER_ARGS="$@"
rm -rf podman/testdata/git
git clone --depth 1 . podman/testdata/git
@@ -9,6 +10,6 @@ for distro in arch ubuntu
do
podman build -t gerbonara-$distro-testenv -f podman/$distro-testenv
mkdir -p /tmp/gerbonara-test-out
- podman run --mount type=bind,src=podman/testdata,dst=/data,ro --mount type=bind,src=/tmp/gerbonara-test-out,dst=/out gerbonara-$distro-testenv /data/testscript.sh
+ podman run --mount type=bind,src=podman/testdata,dst=/data,ro --mount type=bind,src=/tmp/gerbonara-test-out,dst=/out gerbonara-$distro-testenv /data/testscript.sh $CONTAINER_ARGS
done