Skip to content

Commit 68014e6

Browse files
committed
Disable the spanview tests on MacOS for now
And even though CI should now pass for MacOS, the llvm-cov show --debug flag does not work when developing outside of CI, so I'm disabling it for MacOS by default.
1 parent 430dcb6 commit 68014e6

File tree

2 files changed

+20
-0
lines changed
  • src/test/run-make-fulldeps

2 files changed

+20
-0
lines changed

src/test/run-make-fulldeps/coverage-reports-base/Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
BASEDIR=../coverage-reports-base
1414
SOURCEDIR=../coverage
1515

16+
ifeq ($(UNAME),Darwin)
17+
# FIXME(richkadel): It appears that --debug is not available on MacOS even when not running
18+
# under CI.
19+
NO_LLVM_ASSERTIONS=1
20+
endif
21+
1622
# The `llvm-cov show` flag `--debug`, used to generate the `counters` output files, is only enabled
1723
# if LLVM assertions are enabled. Some CI builds disable debug assertions.
1824
ifndef NO_LLVM_ASSERTIONS

src/test/run-make-fulldeps/coverage-spanview-base/Makefile

+14
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
BASEDIR=../coverage-spanview-base
1010
SOURCEDIR=../coverage
1111

12+
ifeq ($(UNAME),Darwin)
13+
SED_HAS_ISSUES=1
14+
endif
15+
1216
all: $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs))
1317

1418
# Ensure there are no `expected` results for tests that may have been removed or renamed
@@ -29,6 +33,14 @@ endif
2933
-Zdump-mir-spanview \
3034
-Zdump-mir-dir="$(TMPDIR)"/mir_dump.$@
3135

36+
ifdef SED_HAS_ISSUES
37+
# FIXME(richkadel): MacOS's default sed has some significant limitations. Until I've come up
38+
# with a better workaround, I'm disabling this test for MacOS.
39+
#
40+
# For future reference, see if `gsed` is available as an alternative.
41+
which gsed || echo "no gsed"
42+
else
43+
3244
for path in "$(TMPDIR)"/mir_dump.$@/*; do \
3345
echo $$path; \
3446
file="$$(basename "$$path")"; \
@@ -58,3 +70,5 @@ else
5870
cp "$(TMPDIR)"/mir_dump.$@/*InstrumentCoverage.0.html "$(TMPDIR)"/actual_mir_dump.$@/
5971
$(DIFF) -r expected_mir_dump.$@/ "$(TMPDIR)"/actual_mir_dump.$@/
6072
endif
73+
74+
endif

0 commit comments

Comments
 (0)