summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rwxr-xr-xscripts/fuse_tests.sh20
2 files changed, 5 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index d0d1840f6..1a42ec9cd 100644
--- a/Makefile
+++ b/Makefile
@@ -121,8 +121,13 @@ smoke-tests: ## Runs a simple smoke test after build runsc.
@$(call submake,run DOCKER_PRIVILEGED="" ARGS="--alsologtostderr --network none --debug --TESTONLY-unsafe-nonroot=true --rootless do true")
.PHONY: smoke-tests
+fuse-tests:
+ @$(call submake,test OPTIONS="--test_tag_filters fuse" TARGETS="test/fuse/...")
+.PHONY: fuse-tests
+
unit-tests: ## Local package unit tests in pkg/..., runsc/, tools/.., etc.
@$(call submake,test TARGETS="pkg/... runsc/... tools/...")
+.PHONY: unit-tests
tests: ## Runs all unit tests and syscall tests.
tests: unit-tests
diff --git a/scripts/fuse_tests.sh b/scripts/fuse_tests.sh
deleted file mode 100755
index bbaaa99fc..000000000
--- a/scripts/fuse_tests.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Copyright 2020 The gVisor Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source $(dirname $0)/common.sh
-
-# Run all vfs2_fuse system call tests.
-test --test_tag_filters=fuse //test/fuse/...