diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | scripts/docker_tests.sh | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -166,8 +166,9 @@ do-tests: runsc simple-tests: unit-tests # Compatibility target. .PHONY: simple-tests +# Keep these in sync with //scripts/docker_tests.sh. IMAGE_FILTER := HelloWorld\|Httpd\|Ruby\|Stdio -INTEGRATION_FILTER := Life\|Pause\|Connect\|JobControl\|Overlay\|Exec\|DirCreation/root +INTEGRATION_FILTER := Life\|Pause\|Connect\|JobControl\|Overlay\|Exec\|DirCreation\|Link docker-tests: load-basic-images @$(call submake,install-test-runtime RUNTIME="vfs1") diff --git a/scripts/docker_tests.sh b/scripts/docker_tests.sh index be0b0a3ec..ce3ffa2eb 100755 --- a/scripts/docker_tests.sh +++ b/scripts/docker_tests.sh @@ -22,6 +22,7 @@ install_runsc_for_test docker test_runsc //test/image:image_test //test/e2e:integration_test install_runsc_for_test docker --vfs2 +# Sync with //Makefile. IMAGE_FILTER="Hello|Httpd|Ruby|Stdio" -INTEGRATION_FILTER="LifeCycle|Pause|Connect|JobControl|Overlay|Exec|DirCreation/root|Link" +INTEGRATION_FILTER="LifeCycle|Pause|Connect|JobControl|Overlay|Exec|DirCreation|Link" test_runsc //test/e2e:integration_test //test/image:image_test --test_filter="${IMAGE_FILTER}|${INTEGRATION_FILTER}" |