Skip to content

Commit ee179c6

Browse files
qinsoonmmtkgc-bot
andauthored
Add tests for sanity GC in ci-test-extended (#267)
Co-authored-by: mmtkgc-bot <[email protected]>
1 parent b4ca3aa commit ee179c6

File tree

5 files changed

+22
-3
lines changed

5 files changed

+22
-3
lines changed

.github/scripts/ci-test-extended.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ $cur/ci-test-vo-bit.sh
3333
MMTK_EXTREME_ASSERTIONS=1 MMTK_MALLOC_MARK_SWEEP=1 $cur/ci-build.sh
3434
$cur/ci-test-malloc-mark-sweep.sh
3535

36+
# Build with sanity
37+
MMTK_SANITY=1 $cur/ci-build.sh
38+
$cur/ci-test-sanity.sh
39+
3640
# Build with mark in header - comment this out as it takes too long.
3741
# export MMTK_MARK_IN_HEADER=1
3842
# export MMTK_MALLOC_MARK_SWEEP=1

.github/scripts/ci-test-sanity.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set -xe
2+
3+
. $(dirname "$0")/common.sh
4+
5+
unset JAVA_TOOL_OPTIONS
6+
7+
MMTK_PLAN=Immix runbms_dacapo2006_with_heap_multiplier fop 4

mmtk/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ memoffset = "0.9.0"
3232
# - change branch
3333
# - change repo name
3434
# But other changes including adding/removing whitespaces in commented lines may break the CI.
35-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "de454f5b5ad9825e5dd0105e0bdc4ce05895a72a" }
35+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "092b7567fee69736b92c4a08dab89f170893ec06" }
3636
# Uncomment the following to build locally
3737
# mmtk = { path = "../repos/mmtk-core" }
3838

openjdk/CompileThirdPartyHeap.gmk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ ifeq ($(MMTK_MALLOC_MARK_SWEEP), 1)
5151
endif
5252
endif
5353

54+
ifeq ($(MMTK_SANITY), 1)
55+
ifndef GC_FEATURES
56+
GC_FEATURES=--features mmtk/sanity
57+
else
58+
GC_FEATURES:=$(strip $(GC_FEATURES))",mmtk/sanity"
59+
endif
60+
endif
61+
5462
LIB_MMTK := $(JVM_LIB_OUTPUTDIR)/libmmtk_openjdk.so
5563

5664
ifeq ($(DEBUG_LEVEL), release)

0 commit comments

Comments
 (0)