From be64906c88c021d6952dc4d69e62b327d78e21a3 Mon Sep 17 00:00:00 2001 From: Juan Cruz Viotti Date: Wed, 14 Feb 2024 17:07:57 -0400 Subject: [PATCH] Increase Unikraft QEMU memory to make remaining tests pass (#766) Signed-off-by: Juan Cruz Viotti --- .github/workflows/ci.yml | 2 +- Makefile | 2 +- unikraft/Makefile.uk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3ca9493..6d42ea20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,4 +146,4 @@ jobs: rm kraftkit_0.7.5_linux_amd64.deb - run: cd unikraft && kraft build --target development --jobs 4 --log-type=basic - - run: cd unikraft && kraft run --target development --disable-acceleration unikraft + - run: cd unikraft && kraft run --target development --memory 200M --disable-acceleration unikraft diff --git a/Makefile b/Makefile index 76748558..f9fdc4ce 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ doxygen: .always unikraft: .always cd unikraft && $(KRAFT) build --target development --jobs 4 --log-type=basic - cd unikraft && $(KRAFT) run --target development + cd unikraft && $(KRAFT) run --memory 200M --target development website: .always $(CMAKE) --build ./build --config $(PRESET) --target website diff --git a/unikraft/Makefile.uk b/unikraft/Makefile.uk index d583e837..fbef8b0b 100644 --- a/unikraft/Makefile.uk +++ b/unikraft/Makefile.uk @@ -17,8 +17,7 @@ SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/decode_varint_test.cc SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/decode_zigzag_test.cc SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/encode_any_test.cc SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/encode_array_test.cc -# TODO: Re-enable these tests after fixing the std::bad_alloc errors -# SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/encode_context_test.cc +SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/encode_context_test.cc SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/encode_enum_test.cc SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/encode_integer_test.cc SOURCEMETA_JSONBINPACK_TEST_SRCS-y += $(TEST_BASE)/runtime/encode_number_test.cc