From 88c95d18a81e4f107cc4e5967bfa45d1bf4882a1 Mon Sep 17 00:00:00 2001
From: Rogan Creswick <creswick@gmail.com>
Date: Fri, 7 Jun 2013 16:00:22 -0700
Subject: cleaned up some test files that broke during a merge

---
 Makefile | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index f35a817..67ff74c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
-- 
cgit v1.2.3