[m-rev.] for review: Skip debugging tests in parallel grades.

Peter Wang novalazy at gmail.com
Fri Nov 18 15:11:46 AEDT 2022


Since commit f380d2c36, the compiler refuses to allow debugging in
parallel grades.

tests/debugger/Mmakefile:
tests/declarative_debugger/Mmakefile:
    Skip debugging tests in parallel grades.

diff --git a/tests/debugger/Mmakefile b/tests/debugger/Mmakefile
index e83bd512d..d6a559b35 100644
--- a/tests/debugger/Mmakefile
+++ b/tests/debugger/Mmakefile
@@ -201,8 +201,9 @@ ALL_NONRETRY_PROGS = \
 	$(TERM_SIZE_PROGS) \
 	$(MMOS_PROGS)
 
-# Debugging doesn't yet don't work in MLDS grades (hl*, csharp, java),
-# and the retry command doesn't and will not work in deep profiling
+# Debugging doesn't yet work in MLDS grades (hl*, csharp, java) or
+# parallel grades.
+# The retry command doesn't and will not work in deep profiling
 # grades (profdeep).
 # Also base grades `jump' and `fast' cannot be used with
 # stack layouts (which are required for tracing).
@@ -225,7 +226,7 @@ else
     DEBUGGER_PROGS = $(DEBUGGER_PROGS0)
 endif
 
-ifneq "$(filter hl% java% csharp%,$(GRADE))" ""
+ifneq "$(filter hl% java% csharp%,$(GRADE))$(findstring par,$(GRADE))" ""
     PROGS =
 else
     ifneq "$(findstring asm_,$(GRADE))" ""
diff --git a/tests/declarative_debugger/Mmakefile b/tests/declarative_debugger/Mmakefile
index 18d4580e5..9e5f20726 100644
--- a/tests/declarative_debugger/Mmakefile
+++ b/tests/declarative_debugger/Mmakefile
@@ -143,13 +143,13 @@ else
     endif
 endif
 
-# Debugging does not work in MLDS (hl*, csharp*, java*) grades
-# or deep profiling (profdeep) grades.
+# Debugging does not work in MLDS (hl*, csharp*, java*) grades,
+# parallel grades, or deep profiling (profdeep) grades.
 # Base grades `jump' and `fast' cannot be used with
 # stack layouts (which are required for tracing).
 # Also, declarative debugging only works in `.gc' grades.
 
-ifeq "$(filter hl% csharp% java%,$(GRADE))$(findstring profdeep,$(GRADE))" ""
+ifeq "$(filter hl% csharp% java%,$(GRADE))$(findstring par,$(GRADE))$(findstring profdeep,$(GRADE))" ""
     ifneq "$(findstring .gc,$(GRADE))" ""
        ifneq "$(findstring asm_,$(GRADE))" ""
            PROGS = $(PROGS_2)
-- 
2.38.0



More information about the reviews mailing list