diff --git a/LibOS/shim/test/regression/mmap_file.c b/LibOS/shim/test/regression/mmap_file.c index 3d869a6418..9840594977 100644 --- a/LibOS/shim/test/regression/mmap_file.c +++ b/LibOS/shim/test/regression/mmap_file.c @@ -89,10 +89,5 @@ int main(int argc, const char** argv) { __asm__ volatile("nop" ::: "memory"); a[page_size] = 0xff; - if (signal(SIGBUS, SIG_DFL) == SIG_ERR) { - perror("signal"); - return 1; - } - return 0; } diff --git a/LibOS/shim/test/regression/test_libos.py b/LibOS/shim/test/regression/test_libos.py index 8c2e0993c7..19a5aa5aee 100644 --- a/LibOS/shim/test/regression/test_libos.py +++ b/LibOS/shim/test/regression/test_libos.py @@ -396,7 +396,10 @@ def test_043_futex_wake_op(self): self.assertIn('Test successful!', stdout) - def test_050_mmap(self): + @unittest.skipIf(HAS_SGX, + 'On SGX, SIGBUS isn\'t always implemented correctly, for lack ' + 'of memory protection. For now, some of these cases won\'t work.') + def test_051_mmap_sgx(self): stdout, _ = self.run_binary(['mmap_file'], timeout=60) # Private mmap beyond file range @@ -409,14 +412,6 @@ def test_050_mmap(self): self.assertIn('mmap test 3 passed', stdout) self.assertIn('mmap test 4 passed', stdout) - # "test 5" and "test 8" are checked below, in test_051_mmap_sgx - - @unittest.skipIf(HAS_SGX, - 'On SGX, SIGBUS isn\'t always implemented correctly, for lack ' - 'of memory protection. For now, some of these cases won\'t work.') - def test_051_mmap_sgx(self): - stdout, _ = self.run_binary(['mmap_file'], timeout=60) - # SIGBUS test self.assertIn('mmap test 5 passed', stdout) self.assertIn('mmap test 8 passed', stdout)