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

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

commit:     8c6654317cc7d17cdb6014b30d1d8c51cbbfa32a
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jun  1 14:58:36 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jun  1 14:58:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8c665431

temporary files: test scripts
	* removed test-desc from Makefile and added test-ebuild_creation2
	* added PYTHON=2|3 to test_ebuildcreation.sh
	modified:   Makefile
	modified:   test_ebuildcreation.sh

---
 Makefile               |   11 +++++------
 test_ebuildcreation.sh |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 10911c0..abc4fe8 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,11 @@ EXAMPLES = ./examples
 PYVER = 3
 PY = python$(PYVER)
 
-PY_DESC_TESTER = ./run_descreader.py
 PY_NOP = ./nop.py
 PY_EBU = ./run_ebuildcreation.py
+PY_EBU2 = ./test_ebuildcreation.sh
 
-.PHONY: default dummy test test-nop \
-	test-ebuild_creation test-desc
+.PHONY: default dummy test test-nop test-ebuild_creation test-ebuild_creation2
 
 default: dummy test
 
@@ -25,7 +24,7 @@ test-nop: $(PY_NOP)
 test-ebuild_creation: test-nop $(PY_EBU) $(EXAMPLES)/packages
 	$(PY) $(PY_EBU) $(EXAMPLES)/packages/*.tar.gz
 
-test-desc: test-nop $(PY_DESC_TESTER) $(EXAMPLES)/packages
-	$(PY) $(PY_DESC_TESTER) $(EXAMPLES)/packages/*.tar.gz
+test-ebuild_creation2: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash
+	PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 1000
 
-test: test-nop test-desc test-ebuild_creation
+test: test-nop test-ebuild_creation test-ebuild_creation2

diff --git a/test_ebuildcreation.sh b/test_ebuildcreation.sh
index 7f838e8..71b352d 100755
--- a/test_ebuildcreation.sh
+++ b/test_ebuildcreation.sh
@@ -6,7 +6,7 @@ readonly _SELF="${0##*/}"
 readonly _SELF_NAME="${_SELF%.*sh}"
 readonly TEST_SECTION="${_SELF_NAME#test_}"
 #
-readonly py=python3
+readonly py=${PYTHON:-python3}
 #
 _ROOT=`pwd`
 if [[ ! -e "${_ROOT}/examples" ]]; then