rename some tests to avoid exceeding windows path limits

And restored missing error message from llvm-cov show

And since some CI builds disable LLVM assertions (which disables the
--debug option in llvm-cov show), I check to see if LLVM assertions are
disabled, and if so, I don't add --debug and don't check the counter
file diffs.

Author: richkadel

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

@@ -13,6 +13,19 @@
 BASEDIR=../coverage-reports-base
 SOURCEDIR=../coverage
 
+# The `llvm-cov show` flag `--debug`, used to generate the `counters` output files, is only enabled
+# if LLVM assertions are enabled. Some CI builds disable debug assertions.
+ifndef NO_LLVM_ASSERTIONS
+DEBUG_FLAG=--debug
+endif
+
+# When generating `expected_*` results (using `x.py test --bless`), the `--debug` flag is forced.
+# If assertions are disabled, the command will fail with an error, rather than attempt to generate
+# only partial results.
+ifdef RUSTC_BLESS_TEST
+DEBUG_FLAG=--debug
+endif
+
 all: $(patsubst $(SOURCEDIR)/%.rs,%,$(wildcard $(SOURCEDIR)/*.rs))
 
 # Ensure there are no `expected` results for tests that may have been removed or renamed
@@ -50,24 +63,27 @@ endif
 			"$(TMPDIR)"/$@.profraw \
 			-o "$(TMPDIR)"/$@.profdata
 
-	# Generate a coverage report using `llvm-cov show`. The output ordering
-	# can be non-deterministic, so ignore the return status. If the test fails
-	# when comparing the JSON `export`, the `show` output may be useful when
-	# debugging.
+	# Generate a coverage report using `llvm-cov show`.
 	"$(LLVM_BIN_DIR)"/llvm-cov show \
-			--debug \
+			$(DEBUG_FLAG) \
 			--Xdemangler="$(RUST_DEMANGLER)" \
 			--show-line-counts-or-regions \
 			--instr-profile="$(TMPDIR)"/$@.profdata \
 			$(call BIN,"$(TMPDIR)"/$@) \
 		> "$(TMPDIR)"/actual_show_coverage.$@.txt \
-		2> "$(TMPDIR)"/show_coverage_stderr.$@.txt
+		2> "$(TMPDIR)"/show_coverage_stderr.$@.txt || \
+	( status=$$? ; \
+		>&2 cat "$(TMPDIR)"/show_coverage_stderr.$@.txt ; \
+		exit $$status \
+	)
 
+ifdef DEBUG_FLAG
 	# The first line (beginning with "Args:" contains hard-coded, build-specific
 	# file paths. Strip that line and keep the remaining lines with counter debug
 	# data.
 	tail -n +2 "$(TMPDIR)"/show_coverage_stderr.$@.txt \
 		> "$(TMPDIR)"/actual_show_coverage_counters.$@.txt
+endif
 
 ifdef RUSTC_BLESS_TEST
 	cp "$(TMPDIR)"/actual_show_coverage.$@.txt \
@@ -87,6 +103,7 @@ else
 			false \
 		)
 
+ifdef DEBUG_FLAG
 	$(DIFF) expected_show_coverage_counters.$@.txt "$(TMPDIR)"/actual_show_coverage_counters.$@.txt || \
 		( grep -q '^\/\/ ignore-llvm-cov-show-diffs' $(SOURCEDIR)/$@.rs && \
 			>&2 echo 'diff failed, but suppressed with `// ignore-llvm-cov-show-diffs` in $(SOURCEDIR)/$@.rs' \
@@ -99,6 +116,7 @@ else
 		# so the crate disambiguator differences will be stripped away. At that point, these files
 		# will be less likely to vary, and the last `echo` above (starting with "Ignore anyway")
 		# can be replaced with `false` to fail the test.
+endif
 
 endif
 

src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.various_conditions.json renamed to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.conditions.json

@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../coverage/various_conditions.rs",
+          "filename": "../coverage/conditions.rs",
           "summary": {
             "functions": {
               "count": 1,

src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.loops_and_branches.json renamed to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.loops_branches.json

@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../coverage/loops_and_branches.rs",
+          "filename": "../coverage/loops_branches.rs",
           "summary": {
             "functions": {
               "count": 2,

src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.partial_eq_counter_without_region.json renamed to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.partial_eq.json

@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../coverage/partial_eq_counter_without_region.rs",
+          "filename": "../coverage/partial_eq.rs",
           "summary": {
             "functions": {
               "count": 5,

src/test/run-make-fulldeps/coverage-reports-deadcode/expected_export_coverage.tight_infinite_loop.json renamed to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.tight_inf_loop.json

@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../coverage/tight_infinite_loop.rs",
+          "filename": "../coverage/tight_inf_loop.rs",
           "summary": {
             "functions": {
               "count": 1,

src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.while_early_return.json renamed to src/test/run-make-fulldeps/coverage-reports-base/expected_export_coverage.while_early_ret.json

@@ -3,7 +3,7 @@
     {
       "files": [
         {
-          "filename": "../coverage/while_early_return.rs",
+          "filename": "../coverage/while_early_ret.rs",
           "summary": {
             "functions": {
               "count": 1,