From b8a9fbbd019b9ecabfd2e3fdb42aaedc07cfab83 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Mon, 8 Jan 2024 11:53:38 -0800 Subject: [PATCH] Review catch_multi_level_pointer test failure This test was was failing on GitHub Actions because GA uses Linux and Linux supports resource usage accounting. Cosmo's compile.com program imposes CPU, memory and file size limits on both the compiler and the test programs themselves. See #1076 --- third_party/libcxxabi/test/BUILD.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/third_party/libcxxabi/test/BUILD.mk b/third_party/libcxxabi/test/BUILD.mk index 010e5526c..dee728a7f 100644 --- a/third_party/libcxxabi/test/BUILD.mk +++ b/third_party/libcxxabi/test/BUILD.mk @@ -41,6 +41,7 @@ THIRD_PARTY_LIBCXXABI_TEST_SRCS = \ third_party/libcxxabi/test/exception_object_alignment.pass.cc \ third_party/libcxxabi/test/exception_object_alignment.2.pass.cc \ third_party/libcxxabi/test/guard_test_basic.pass.cc \ + third_party/libcxxabi/test/catch_multi_level_pointer.pass.cc \ third_party/libcxxabi/test/incomplete_type.sh.cc \ third_party/libcxxabi/test/inherited_exception.pass.cc \ third_party/libcxxabi/test/test_aux_runtime.pass.cc \ @@ -64,7 +65,7 @@ THIRD_PARTY_LIBCXXABI_TEST_SRCS = \ third_party/libcxxabi/test/unwind_05.pass.cc \ third_party/libcxxabi/test/unwind_06.pass.cc -# TODO: LLVM needs to finish the code that lets us use NSYNC futexes +# TODO: Maybe LLVM needs to finish the code that lets us use NSYNC futexes? THIRD_PARTY_LIBCXXABI_TEST_SRCS_TOOSLOW_COSMO = \ third_party/libcxxabi/test/guard_threaded_test.pass.cc \ @@ -74,10 +75,6 @@ THIRD_PARTY_LIBCXXABI_TEST_SRCS_FAILING_GCC = \ third_party/libcxxabi/test/catch_member_function_pointer_01.pass.cc \ third_party/libcxxabi/test/catch_member_function_pointer_02.pass.cc -# Works if run, but fails to compile on GitHub Actions with an OOM -THIRD_PARTYLIBCXXABI_TEST_SRCS_COMPILE_OOM = \ - third_party/libcxxabi/test/catch_multi_level_pointer.pass.cc - THIRD_PARTY_LIBCXXABI_TEST_COMS = \ $(THIRD_PARTY_LIBCXXABI_TEST_SRCS:%.cc=o/$(MODE)/%.com) @@ -173,6 +170,9 @@ o/$(MODE)/third_party/libcxxabi/test/incomplete_type.sh.com.dbg: \ endif +o/$(MODE)/third_party/libcxxabi/test/catch_multi_level_pointer.pass.o: private COPTS += -O0 +o/$(MODE)/third_party/libcxxabi/test/catch_multi_level_pointer.pass.o: private QUOTA += -C30 -M4000m + .PHONY: o/$(MODE)/third_party/libcxxabi/test o/$(MODE)/third_party/libcxxabi/test: \ $(THIRD_PARTY_LIBCXXABI_TEST_BINS) \