[gentoo-commits] proj/R_overlay:master commit in: /

["André Erdmann" <dywi@mailerd.de>]

commit:     60501099176c38a35ecae2879d7b7cdd7579b875
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun 22 18:09:59 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun 22 18:09:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=60501099

update Makefile

---
 Makefile |   35 ++++++++++++-----------------------
 1 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index 3f4e63c..07dce33 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 # runs tests
 EXAMPLES = ./examples
+PACKAGES = $(EXAMPLES)/packages
 
 # make PYVER=<2|3> <target>
 PYVER = 3
@@ -8,17 +9,18 @@ PY = python$(PYVER)
 LOGDIR = ./log
 
 PY_NOP = ./nop.py
-PY_EBU = ./run_ebuildcreation.py
-PY_EBU2 = ./test_ebuildcreation.sh
+PY_OVL = ./run_overlaycreation.py
 
-.PHONY: default dummy test test-nop \
-	test-ebuild_creation \
-	test-ebuild_creation2 \
-	test-ebuild_creation3 \
-	test-seewave seewave
+.PHONY: default dummy \
+	test test-nop nop \
+	test-seewave seewave \
+	clean-log
 
 default: dummy test
 
+seewave: test-seewave
+nop: test-nop
+
 clean-log:
 	rm -fv -- $(LOGDIR)/*.log
 
@@ -28,23 +30,10 @@ $(LOGDIR):
 dummy:
 	$(PY) --version
 
-seewave: test-seewave
-
-test-seewave: test-nop $(PY_EBU) $(EXAMPLES)/packages
-	$(PY) $(PY_EBU) $(EXAMPLES)/packages/seewave_*.tar.gz
+test-seewave: test-nop $(PY_OVL) $(PACKAGES)
+	$(PY) $(PY_OVL) --show $(PACKAGES)/seewave_*.tar.gz
 
 test-nop: $(PY_NOP) $(LOGDIR)
 	@$(PY) $(PY_NOP)
 
-# test-desc (file) has been removed in favor of test-desc (tar),
-#  which is included in ebuild creation
-test-ebuild_creation: test-nop $(PY_EBU) $(EXAMPLES)/packages
-	$(PY) $(PY_EBU) $(EXAMPLES)/packages/*.tar.gz
-
-test-ebuild_creation2: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash
-	PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 100
-
-test-ebuild_creation3: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash
-	PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 1000
-
-test: test-nop test-ebuild_creation test-ebuild_creation2 test-seewave
+test: test-nop test-seewave