diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | main/Makefile.am | 2 | ||||
| -rw-r--r-- | main/tests/Makefile.am | 5 |
3 files changed, 6 insertions, 3 deletions
@@ -113,7 +113,7 @@ test: cd main && $(MAKE) test assembly=$(assembly) uitest: - cd main && $(MAKE) uitest assembly=$(assembly) + cd main && $(MAKE) uitest assembly=$(assembly) tests=$(tests) coverage: cd main && $(MAKE) coverage diff --git a/main/Makefile.am b/main/Makefile.am index 195f502fba..f075ee815b 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -163,7 +163,7 @@ test: cd tests && $(MAKE) test assembly=$(assembly) uitest: - cd tests && $(MAKE) uitest assembly=$(assembly) categories=$(categories) + cd tests && $(MAKE) uitest assembly=$(assembly) categories=$(categories) tests=$(tests) coverage: cd tests && $(MAKE) coverage diff --git a/main/tests/Makefile.am b/main/tests/Makefile.am index fc415a01dc..ac6e561003 100644 --- a/main/tests/Makefile.am +++ b/main/tests/Makefile.am @@ -77,7 +77,10 @@ uitest: if test -n "$(categories)"; then \ ($(RUN_TEST) -xml=TestResult_`basename $$asm`.xml -labels -include=$(categories) $$asm) || exit $?; \ fi; \ - if ! test -n "$(categories)"; then \ + if test -n "$(tests)"; then \ + ($(RUN_TEST) -xml=TestResult_`basename $$asm`.xml -labels -run=$(tests) $$asm) || exit $?; \ + fi; \ + if ! test -n "$(categories)" && ! test -n "$(tests)"; then \ ($(RUN_TEST) -xml=TestResult_`basename $$asm`.xml -labels $$asm) || exit $?; \ fi; \ fi; \ |