diff options
| author |  Trevor Elliott <trevor@galois.com> | 2013-06-10 11:19:47 -0700 |
|---|---|---|
| committer | Trevor Elliott <trevor@galois.com> | 2013-06-10 11:19:47 -0700 |
| commit | 877520a9fa9020bfbcb10512b6b771f4491d3b9e (patch) | |
| tree | 7accf42fef67e1b5dcdd97a324ef72bae4521151 /src/batchtools | |
| parent | 686d00c01dc3096953156fa43daa164f1d59b7dc (diff) | |
Move more commands to Config.mk
Diffstat (limited to 'src/batchtools')
| -rw-r--r-- | src/batchtools/build.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/batchtools/build.mk b/src/batchtools/build.mk index 8649476..e238ddf 100644 --- a/src/batchtools/build.mk +++ b/src/batchtools/build.mk @@ -1,9 +1,8 @@ -mvn-exe := $(shell which mvn 2>/dev/null) batchtools-dir := $(path) -ifeq "$(mvn-exe)" "" -$(call strict-error,"No maven found, unable to run batchtools tests") +ifeq "$(maven-exe)" "" +$(call strict-error,"No maven found: unable to run batchtools tests") else test: test-batchtools @@ -11,9 +10,9 @@ test: test-batchtools .PHONY: test-batchtools test-batchtools: $(topdir)/profiles/chrome $(topdir)/profiles/firefox $(call label,BATCHTEST)(cd $(batchtools-dir) \ - && xvfb-run -a $(mvn-cmd) test) + && xvfb-run -a $(maven-cmd) test) clean:: - (cd $(batchtools-dir) && $(mvn-exe) clean) + (cd $(batchtools-dir) && $(maven-exe) clean) endif |