Skip to contentSkip to conversation

Ensure test-genrandom availability for t5301/t5302

PATCH In review Dana How 3 participants 4 messages Jun 15, 2016 Kbuild

lore
Share & tools
lore

Dana How

author
#0 lore raw

PATCH 1/1 Ensure test-genrandom availability for t5301/t5302

Check for this as well as test-chmtime in test-lib.sh

---
 t/test-lib.sh |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
t/test-lib.sh +8 -5
index f2c6bd3..d7838fc 100644
@@ -268,11 +268,14 @@ test -d ../templates/blt || {
 	error "You haven't built things yet, have you?"
 }
 
-if ! test -x ../test-chmtime; then
-	echo >&2 'You need to build test-chmtime:'
-	echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
-	exit 1
-fi
+for prog in test-chmtime test-genrandom
+do
+	if ! test -x ../$prog; then
+		echo >&2 "You need to build $prog:"
+		echo >&2 "Run \"make $prog\" in the source (toplevel) directory"
+		exit 1
+	fi
+done
 
 # Test repository
 test=trash
Signature · 1 line
1.5.2.rc0.71.g4342-dirty
#1 lore raw
Quoted 33 lines · Dana How

Check for this as well as test-chmtime in test-lib.sh

---
 t/test-lib.sh |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
t/test-lib.sh +8 -5
index f2c6bd3..d7838fc 100644
@@ -268,11 +268,14 @@ test -d ../templates/blt || {
 	error "You haven't built things yet, have you?"
 }
 
-if ! test -x ../test-chmtime; then
-	echo >&2 'You need to build test-chmtime:'
-	echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
-	exit 1
-fi
+for prog in test-chmtime test-genrandom
+do
+	if ! test -x ../$prog; then
+		echo >&2 "You need to build $prog:"
+		echo >&2 "Run \"make $prog\" in the source (toplevel) directory"
+		exit 1
+	fi
+done
 
 # Test repository
 test=trash
Signature · 1 line
1.5.2.rc0.71.g4342-dirty

As these two are very small programs, why not always build them upon "make all", like this?

---
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Makefile +5 -1
index 60c41fd..817f8ef 100644
@@ -933,13 +933,17 @@ endif
 
 ### Testing rules
 
+TEST_PROGRAMS = test-chmtime$X test-genrandom$X
+
+all:: $(TEST_PROGRAMS)
+
 # GNU make supports exporting all variables by "export" without parameters.
 # However, the environment gets quite big, and some programs have problems
 # with that.
 
 export NO_SVN_TESTS
 
-test: all test-chmtime$X test-genrandom$X
+test: all
 	$(MAKE) -C t/ all
 
 test-date$X: test-date.c date.o ctype.o
#2 lore raw

Either way is fine with me.
I just don't want any one to have the nasty surprise I had -- fortunately I figured it out quickly.

So you will apply your patch?

Thanks,

Dana

Quoted 69 lines · Junio C Hamano
Quoted 32 lines · Dana How

Check for this as well as test-chmtime in test-lib.sh

---
 t/test-lib.sh |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
t/test-lib.sh +8 -6
index f2c6bd3..d7838fc 100644
@@ -268,11 +268,14 @@ test -d ../templates/blt || {
      error "You haven't built things yet, have you?"
 }
 
-if ! test -x ../test-chmtime; then
-     echo >&2 'You need to build test-chmtime:'
-     echo >&2 'Run "make test-chmtime" in the source (toplevel) directory'
-     exit 1
-fi
+for prog in test-chmtime test-genrandom
+do
+     if ! test -x ../$prog; then
+             echo >&2 "You need to build $prog:"
+             echo >&2 "Run \"make $prog\" in the source (toplevel) directory"
+             exit 1
+     fi
+done
 
 # Test repository
 test=trash
--
Quoted 1 line

1.5.2.rc0.71.g4342-dirty

As these two are very small programs, why not always build them upon "make all", like this?

---
 Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Makefile +5 -1
index 60c41fd..817f8ef 100644
@@ -933,13 +933,17 @@ endif
 
 ### Testing rules
 
+TEST_PROGRAMS = test-chmtime$X test-genrandom$X
+
+all:: $(TEST_PROGRAMS)
+
 # GNU make supports exporting all variables by "export" without parameters.
 # However, the environment gets quite big, and some programs have problems
 # with that.
 
 export NO_SVN_TESTS
 
-test: all test-chmtime$X test-genrandom$X
+test: all
        $(MAKE) -C t/ all
 
 test-date$X: test-date.c date.o ctype.o
Signature · 1 line
Dana L. How  [email protected]  +1 650 804 5991 cell
#3 lore raw
Quoted 5 lines · Dana How

Either way is fine with me.
I just don't want any one to have the nasty surprise I had -- fortunately I figured it out quickly.

So you will apply your patch?

Perhaps. I've known about this for some time, but it is usually not a problem if you do "make test" from the toplevel, hence it was a low priority for me.