diff --git a/test/runner/defs.bzl b/test/runner/defs.bzl index 6e7212c71..dbc9364f1 100644 --- a/test/runner/defs.bzl +++ b/test/runner/defs.bzl @@ -69,7 +69,6 @@ def _syscall_test( file_access = "exclusive", overlay = False, add_host_communication = False, - lisafs = True, fuse = False, container = None, one_sandbox = True, @@ -85,8 +84,6 @@ def _syscall_test( name += "_overlay" if fuse: name += "_fuse" - if not lisafs: - name += "_p9" if network != "none": name += "_" + network + "net" @@ -139,7 +136,6 @@ def _syscall_test( "--file-access=" + file_access, "--overlay=" + str(overlay), "--add-host-communication=" + str(add_host_communication), - "--lisafs=" + str(lisafs), "--fuse=" + str(fuse), "--strace=" + str(debug), "--debug=" + str(debug), @@ -226,20 +222,6 @@ def syscall_test( **kwargs ) - # Generate a P9 variant with the default platform. - _syscall_test( - test = test, - platform = default_platform, - use_tmpfs = use_tmpfs, - add_host_communication = add_host_communication, - tags = platforms[default_platform] + tags, - debug = debug, - fuse = fuse, - container = container, - one_sandbox = one_sandbox, - lisafs = False, - **kwargs - ) if add_overlay: _syscall_test( test = test, diff --git a/test/runner/main.go b/test/runner/main.go index 0c47a158d..eeacc0024 100644 --- a/test/runner/main.go +++ b/test/runner/main.go @@ -52,7 +52,6 @@ var ( fileAccess = flag.String("file-access", "exclusive", "mounts root in exclusive or shared mode") overlay = flag.Bool("overlay", false, "wrap filesystem mounts with writable tmpfs overlay") fuse = flag.Bool("fuse", false, "enable FUSE") - lisafs = flag.Bool("lisafs", true, "enable lisafs protocol if vfs2 is also enabled") container = flag.Bool("container", false, "run tests in their own namespaces (user ns, network ns, etc), pretending to be root. Implicitly enabled if network=host, or if using network namespaces") setupContainerPath = flag.String("setup-container", "", "path to setup_container binary (for use with --container)") trace = flag.Bool("trace", false, "enables all trace points") @@ -200,7 +199,6 @@ func runRunsc(tc *gtest.TestCase, spec *specs.Spec) error { "-TESTONLY-allow-packet-endpoint-write=true", "-net-raw=true", fmt.Sprintf("-panic-signal=%d", unix.SIGTERM), - fmt.Sprintf("-lisafs=%t", *lisafs), "-watchdog-action=panic", "-platform", *platform, "-file-access", *fileAccess, @@ -435,7 +433,6 @@ func runTestCaseRunsc(testBin string, tc *gtest.TestCase, args []string, t *test platformVar = "TEST_ON_GVISOR" networkVar = "GVISOR_NETWORK" fuseVar = "FUSE_ENABLED" - lisafsVar = "LISAFS_ENABLED" ) env := append(os.Environ(), platformVar+"="+*platform, networkVar+"="+*network) if *platformSupport != "" { @@ -446,11 +443,6 @@ func runTestCaseRunsc(testBin string, tc *gtest.TestCase, args []string, t *test } else { env = append(env, fuseVar+"=FALSE") } - if *lisafs { - env = append(env, lisafsVar+"=TRUE") - } else { - env = append(env, lisafsVar+"=FALSE") - } // Remove shard env variables so that the gunit binary does not try to // interpret them. diff --git a/test/syscalls/linux/connect_external.cc b/test/syscalls/linux/connect_external.cc index fa043969f..4e44de0c9 100644 --- a/test/syscalls/linux/connect_external.cc +++ b/test/syscalls/linux/connect_external.cc @@ -114,9 +114,6 @@ TEST_P(GoferStreamSeqpacketTest, NonListening) { // Bind to a socket, then Listen and Accept. TEST_P(GoferStreamSeqpacketTest, BindListenAccept) { - // Binding to host socket requires LisaFS. - SKIP_IF(IsRunningOnGvisor() && !IsLisafsEnabled()); - std::string env; ProtocolSocket proto; std::tie(env, proto) = GetParam(); diff --git a/test/util/test_util.cc b/test/util/test_util.cc index b0ab5de7d..181adfc1f 100644 --- a/test/util/test_util.cc +++ b/test/util/test_util.cc @@ -42,7 +42,6 @@ namespace testing { constexpr char kGvisorNetwork[] = "GVISOR_NETWORK"; constexpr char kFuseEnabled[] = "FUSE_ENABLED"; -constexpr char kLisafsEnabled[] = "LISAFS_ENABLED"; bool IsRunningOnGvisor() { return GvisorPlatform() != Platform::kNative; } @@ -65,11 +64,6 @@ bool IsFUSEEnabled() { return env && strcmp(env, "TRUE") == 0; } -bool IsLisafsEnabled() { - const char* env = getenv(kLisafsEnabled); - return env && strncmp(env, "TRUE", 4) == 0; -} - // Inline cpuid instruction. Preserve %ebx/%rbx register. In PIC compilations // %ebx contains the address of the global offset table. %rbx is occasionally // used to address stack variables in presence of dynamic allocas. diff --git a/test/util/test_util.h b/test/util/test_util.h index f07eae6a5..9eec41904 100644 --- a/test/util/test_util.h +++ b/test/util/test_util.h @@ -225,7 +225,6 @@ bool IsRunningOnGvisor(); const std::string GvisorPlatform(); bool IsRunningWithHostinet(); bool IsFUSEEnabled(); -bool IsLisafsEnabled(); #ifdef __linux__ void SetupGvisorDeathTest();