Skip to content

Commit 8939a82

Browse files
committed
Make the messages more consistent
It is not worthwhile to retrieve small remote files of about 1 KB using wget with the progress option enabled. Instead, non-fatal errors are not reported.
1 parent d0a6060 commit 8939a82

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ EXPECTED_fcalc = Performed 12 tests, 0 failures, 100% success rate.
256256
EXPECTED_pi = 3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117067982148086
257257

258258
check-hello: $(BIN)
259-
$(Q)$(PRINTF) "Running hello.elf ..."; \
259+
$(Q)$(PRINTF) "Running hello.elf ... "; \
260260
if [ "$(shell $(BIN) $(OUT)/hello.elf | uniq)" = "$(strip $(EXPECTED_hello)) inferior exit code 0" ]; then \
261261
$(call notice, [OK]); \
262262
else \

mk/artifact.mk

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ endif
5252

5353
artifact: fetch-checksum ieeelib scimark2
5454
ifeq ($(call has, PREBUILT), 1)
55-
$(Q)$(PRINTF) "Checking SHA1 of binaries ...\n"
55+
$(Q)$(PRINTF) "Checking SHA-1 of prebuilt binaries ... "
5656

5757
$(Q)$(eval PREBUILT_X86_FILENAME := $(shell cat $(BIN_DIR)/sha1sum-linux-x86-softfp | awk '{ print $$2 };'))
5858
$(Q)$(eval PREBUILT_RV32_FILENAME := $(shell cat $(BIN_DIR)/sha1sum-riscv32 | awk '{ print $$2 };'))
@@ -66,10 +66,10 @@ ifeq ($(call has, PREBUILT), 1)
6666
))
6767

6868
$(Q)if [ "$(RES)" = "1" ]; then \
69-
$(PRINTF) "$(YELLOW)SHA1 verifications fail! Re-fetching prebuilt binaries from \"rv32emu-prebuilt\" ...\n$(NO_COLOR)"; \
69+
$(PRINTF) "\n$(YELLOW)SHA-1 verification fails! Re-fetching prebuilt binaries from \"rv32emu-prebuilt\" ...\n$(NO_COLOR)"; \
7070
wget -q --show-progress https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/rv32emu-prebuilt.tar.gz -O- | tar -C build --strip-components=1 -xz; \
7171
else \
72-
$(PRINTF) "$(PASS_COLOR)SHA1 verifications succeed!\n$(NO_COLOR)"; \
72+
$(call notice, [OK]); \
7373
fi
7474
else
7575
git submodule update --init $(addprefix ./tests/,$(foreach tb,$(TEST_SUITES),$(tb)))
@@ -106,9 +106,10 @@ endif
106106

107107
fetch-checksum:
108108
ifeq ($(call has, PREBUILT), 1)
109-
$(Q)$(PRINTF) "Fetching SHA1 of binaries ...\n"
110-
$(Q)wget -q --show-progress -O $(BIN_DIR)/sha1sum-linux-x86-softfp https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/sha1sum-linux-x86-softfp
111-
$(Q)wget -q --show-progress -O $(BIN_DIR)/sha1sum-riscv32 https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/sha1sum-riscv32
109+
$(Q)$(PRINTF) "Fetching SHA-1 of prebuilt binaries ... "
110+
$(Q)wget -q -O $(BIN_DIR)/sha1sum-linux-x86-softfp https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/sha1sum-linux-x86-softfp
111+
$(Q)wget -q -O $(BIN_DIR)/sha1sum-riscv32 https://github.com/sysprog21/rv32emu-prebuilt/releases/download/$(LATEST_RELEASE)/sha1sum-riscv32
112+
$(Q)$(call notice, [OK])
112113
endif
113114

114115
scimark2:

0 commit comments

Comments
 (0)