configurable-make-test: Allows make test to be run with SHUNIT_BIN.

wilmoore · postmodern · commit 84ca7e50834e · 2012-12-11T00:49:14.000-08:00
- Contributors may have installed shunit2(1) to somewhere other than
  `/usr/share/shunit2/shunit2`.
- Allow `SHUNIT2_BIN=$(which shunit2) make test`.
- Default to `/usr/share/shunit2/shunit2` if `SHUNIT2_BIN` is not given.
diff --git a/Makefile b/Makefile
@@ -13,6 +13,7 @@ SIG=$(PKG_DIR)/$(PKG_NAME).asc
 
 PREFIX?=/usr/local
 DOC_DIR=$(PREFIX)/share/doc/$(PKG_NAME)
+SHUNIT_BIN?=/usr/share/shunit2/shunit2
 
 pkg:
 	mkdir -p $(PKG_DIR)
@@ -33,8 +34,8 @@ clean:
 all: $(PKG) $(SIG)
 
 test:
-	SHELL=`which bash` ./test/runner
-	SHELL=`which zsh` ./test/runner
+	SHELL=`which bash` SHUNIT_BIN=$(SHUNIT_BIN) ./test/runner
+	SHELL=`which zsh`  SHUNIT_BIN=$(SHUNIT_BIN) ./test/runner
 
 tag:
 	git push
diff --git a/test/chruby_reset_test.sh b/test/chruby_reset_test.sh
@@ -38,4 +38,4 @@ test_chruby_reset_duplicate_path()
 	assertEquals "PATH was not sanitized"    "$TEST_PATH" "$PATH"
 }
 
-SHUNIT_PARENT=$0 . /usr/share/shunit2/shunit2
+SHUNIT_PARENT=$0 . $SHUNIT_BIN
diff --git a/test/chruby_test.sh b/test/chruby_test.sh
@@ -29,4 +29,4 @@ test_chruby_unknown()
 	assertEquals "did not return 1" $? 1
 }
 
-SHUNIT_PARENT=$0 . /usr/share/shunit2/shunit2
+SHUNIT_PARENT=$0 . $SHUNIT_BIN
diff --git a/test/chruby_use_test.sh b/test/chruby_use_test.sh
@@ -23,4 +23,4 @@ tearDown() {
 	chruby_reset
 }
 
-SHUNIT_PARENT=$0 . /usr/share/shunit2/shunit2
+SHUNIT_PARENT=$0 . $SHUNIT_BIN

Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,4 @@ test_chruby_reset_duplicate_path()`
`38`	`38`	`assertEquals "PATH was not sanitized" "$TEST_PATH" "$PATH"`
`39`	`39`	`}`
`40`	`40`
`41`		`-SHUNIT_PARENT=$0 . /usr/share/shunit2/shunit2`
	`41`	`+SHUNIT_PARENT=$0 . $SHUNIT_BIN`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,4 @@ test_chruby_unknown()`
`29`	`29`	`assertEquals "did not return 1" $? 1`
`30`	`30`	`}`
`31`	`31`
`32`		`-SHUNIT_PARENT=$0 . /usr/share/shunit2/shunit2`
	`32`	`+SHUNIT_PARENT=$0 . $SHUNIT_BIN`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,4 @@ tearDown() {`
`23`	`23`	`chruby_reset`
`24`	`24`	`}`
`25`	`25`
`26`		`-SHUNIT_PARENT=$0 . /usr/share/shunit2/shunit2`
	`26`	`+SHUNIT_PARENT=$0 . $SHUNIT_BIN`