diff options
| author |  Rogan Creswick <creswick@gmail.com> | 2013-06-07 16:00:22 -0700 |
|---|---|---|
| committer | Rogan Creswick <creswick@gmail.com> | 2013-06-07 16:00:22 -0700 |
| commit | 88c95d18a81e4f107cc4e5967bfa45d1bf4882a1 (patch) | |
| tree | f1b8f5bb1bffd8ea84078d829248dddbdc2f3544 /Makefile | |
| parent | 04d3c6e96ed4dd528418fe71a85e72316ae5bba4 (diff) | |
cleaned up some test files that broke during a merge
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -80,19 +80,14 @@ MVN_TEST_CMD := xvfb-run -a $(MVN_EXE) test define pkg .PHONY: pkg-$1 pkg-$1: - cd batchtools/$1 && xvfb-run -a $(MVN_EXE) install + cd src/$1 && xvfb-run -a $(MVN_EXE) package endef -$(eval $(call pkg,rsTester)) -$(eval $(call pkg,headless)) +$(eval $(call pkg,batchtools)) -TEST_RUNNER_DIR := testrunner -HEADLESS_DIR := batchtools/headless -RSTESTER_DIR := batchtools/rsTester +BATCHTOOLS_DIR := src/batchtools -test: fiveui.crx fiveui.xpi $(topdir)/profiles/chrome $(topdir)/profiles/firefox pkg-rsTester -# cd $(TEST_RUNNER_DIR) && $(MVN_TEST_CMD) - cd $(RSTESTER_DIR) && $(MVN_TEST_CMD) - cd $(HEADLESS_DIR) && $(MVN_TEST_CMD) +test: fiveui.crx fiveui.xpi $(topdir)/profiles/chrome $(topdir)/profiles/firefox + cd $(BATCHTOOLS_DIR) && $(MVN_TEST_CMD) endif |