aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Erdmann <dywi@mailerd.de>2012-06-22 20:09:59 +0200
committerAndré Erdmann <dywi@mailerd.de>2012-06-22 20:09:59 +0200
commit60501099176c38a35ecae2879d7b7cdd7579b875 (patch)
treebc9f505514ca93bf8a954d7af11bcca41ba1594a /Makefile
parentexplain SIMPLE_RULES_FILE in R-overlay.conf (diff)
downloadR_overlay-60501099176c38a35ecae2879d7b7cdd7579b875.tar.gz
R_overlay-60501099176c38a35ecae2879d7b7cdd7579b875.tar.bz2
R_overlay-60501099176c38a35ecae2879d7b7cdd7579b875.zip
update Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile35
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