summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZach Koopmans <zkoopmans@google.com>2020-08-10 12:25:48 -0700
committergVisor bot <gvisor-bot@google.com>2020-08-10 12:27:53 -0700
commit9ac71dc78fd1a2487780686332e54c21a1cb2cd3 (patch)
treeff627e6dc03750e26f5963144c78582b6b9b1702
parent79e7d0b06ac019e3c302e2ab9c5861311304d7d1 (diff)
Mark DirCreation/tmp tests as passing.
PiperOrigin-RevId: 325861904
-rw-r--r--Makefile3
-rwxr-xr-xscripts/docker_tests.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 365a4b485..d62567939 100644
--- a/Makefile
+++ b/Makefile
@@ -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}"