| 1 |
commit: 8c6654317cc7d17cdb6014b30d1d8c51cbbfa32a |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Fri Jun 1 14:58:36 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Fri Jun 1 14:58:36 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8c665431 |
| 7 |
|
| 8 |
temporary files: test scripts |
| 9 |
* removed test-desc from Makefile and added test-ebuild_creation2 |
| 10 |
* added PYTHON=2|3 to test_ebuildcreation.sh |
| 11 |
modified: Makefile |
| 12 |
modified: test_ebuildcreation.sh |
| 13 |
|
| 14 |
--- |
| 15 |
Makefile | 11 +++++------ |
| 16 |
test_ebuildcreation.sh | 2 +- |
| 17 |
2 files changed, 6 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/Makefile b/Makefile |
| 20 |
index 10911c0..abc4fe8 100644 |
| 21 |
--- a/Makefile |
| 22 |
+++ b/Makefile |
| 23 |
@@ -5,12 +5,11 @@ EXAMPLES = ./examples |
| 24 |
PYVER = 3 |
| 25 |
PY = python$(PYVER) |
| 26 |
|
| 27 |
-PY_DESC_TESTER = ./run_descreader.py |
| 28 |
PY_NOP = ./nop.py |
| 29 |
PY_EBU = ./run_ebuildcreation.py |
| 30 |
+PY_EBU2 = ./test_ebuildcreation.sh |
| 31 |
|
| 32 |
-.PHONY: default dummy test test-nop \ |
| 33 |
- test-ebuild_creation test-desc |
| 34 |
+.PHONY: default dummy test test-nop test-ebuild_creation test-ebuild_creation2 |
| 35 |
|
| 36 |
default: dummy test |
| 37 |
|
| 38 |
@@ -25,7 +24,7 @@ test-nop: $(PY_NOP) |
| 39 |
test-ebuild_creation: test-nop $(PY_EBU) $(EXAMPLES)/packages |
| 40 |
$(PY) $(PY_EBU) $(EXAMPLES)/packages/*.tar.gz |
| 41 |
|
| 42 |
-test-desc: test-nop $(PY_DESC_TESTER) $(EXAMPLES)/packages |
| 43 |
- $(PY) $(PY_DESC_TESTER) $(EXAMPLES)/packages/*.tar.gz |
| 44 |
+test-ebuild_creation2: test-nop $(PY_EBU) $(PY_EBU2) $(EXAMPLES)/packages /bin/bash |
| 45 |
+ PYTHON=$(PY) /bin/bash $(PY_EBU2) -q 1000 |
| 46 |
|
| 47 |
-test: test-nop test-desc test-ebuild_creation |
| 48 |
+test: test-nop test-ebuild_creation test-ebuild_creation2 |
| 49 |
|
| 50 |
diff --git a/test_ebuildcreation.sh b/test_ebuildcreation.sh |
| 51 |
index 7f838e8..71b352d 100755 |
| 52 |
--- a/test_ebuildcreation.sh |
| 53 |
+++ b/test_ebuildcreation.sh |
| 54 |
@@ -6,7 +6,7 @@ readonly _SELF="${0##*/}" |
| 55 |
readonly _SELF_NAME="${_SELF%.*sh}" |
| 56 |
readonly TEST_SECTION="${_SELF_NAME#test_}" |
| 57 |
# |
| 58 |
-readonly py=python3 |
| 59 |
+readonly py=${PYTHON:-python3} |
| 60 |
# |
| 61 |
_ROOT=`pwd` |
| 62 |
if [[ ! -e "${_ROOT}/examples" ]]; then |
Archives