[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 88beac5: Prevent 'make system_test' from stal
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 88beac5: Prevent 'make system_test' from stalling |
Date: |
Wed, 2 Nov 2016 15:54:43 +0000 (UTC) |
branch: master
commit 88beac5d4814d39c7878fb188de3b397ec27f553
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Prevent 'make system_test' from stalling
Formerly, the 'touchstone_md5sums' target (on which the 'system_test'
target depends) stalled when /opt/touchstone contained no files to be
passed to 'md5sum', which would then try to read stdin.
---
workhorse.make | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/workhorse.make b/workhorse.make
index c091373..ac2e07a 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1235,8 +1235,14 @@ touchstone_exclusions := $(touchstone_md5sums)
$(touchstone_dir)/ChangeLog
touchstone_files := \
$(filter-out $(touchstone_exclusions),$(wildcard $(touchstone_dir)/*))
+# Don't call md5sum with an empty $(touchstone_files) list, which would
+# cause md5sum to wait indefinitely for input; instead, create an empty
+# $(touchstone_md5sums) iff none exists, because this is a prerequisite
+# of the 'system_test' target.
+
$(touchstone_md5sums): $(touchstone_files)
- @cd $(touchstone_dir) && $(MD5SUM) --binary $(notdir $^) > $@
+ @-[ -f "$@" ] || $(TOUCH) $@
+ @-[ -n "$^" ] && cd $(touchstone_dir) && $(MD5SUM) --binary $(notdir
$^) > $@
@$(SORT) --key=2 --output=$@ $@
testdeck_suffixes := cns ill ini inix mec gpt
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [lmi] master 88beac5: Prevent 'make system_test' from stalling,
Greg Chicares <=