diff options
| author | Emanuele Aina <em@nerd.ocracy.org> | 2007-06-25 09:39:16 +0000 |
|---|---|---|
| committer | Emanuele Aina <em@nerd.ocracy.org> | 2007-06-25 09:39:16 +0000 |
| commit | 6b69cdbb9d80d729bffecd8a2f235d48c134d394 (patch) | |
| tree | 06779bf12a5f6550b790e607eb417b2e934c1f5c /rules | |
| parent | 41dbc77310f4eefe92075c97d1b27122c57553fc (diff) | |
| download | telepathy-salut-6b69cdbb9d80d729bffecd8a2f235d48c134d394.tar.gz | |
Use the variable instead of calling make directly
20070625093916-f974e-a951f658ae1ad2ae4198505fcc9a57e164d1924d.gz
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/check.mak | 8 | ||||
| -rw-r--r-- | rules/lcov.mak | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/rules/check.mak b/rules/check.mak index 5c758431..220d1f92 100644 --- a/rules/check.mak +++ b/rules/check.mak @@ -55,7 +55,7 @@ LOOPS = 10 # valgrind any given test until failure by running make test.valgrind-forever %.valgrind-forever: % - @while make $*.valgrind; do \ + @while $(MAKE) $*.valgrind; do \ true; done # gdb any given test by running make test.gdb @@ -70,7 +70,7 @@ torture: $(TESTS) -rm test-registry.xml @echo "Torturing tests ..." for i in `seq 1 $(LOOPS)`; do \ - make check || \ + $(MAKE) check || \ (echo "Failure after $$i runs"; exit 1) || \ exit 1; \ done @@ -83,7 +83,7 @@ forever: $(TESTS) -rm test-registry.xml @echo "Forever tests ..." while true; do \ - make check || \ + $(MAKE) check || \ (echo "Failure"; exit 1) || \ exit 1; \ done @@ -93,7 +93,7 @@ valgrind: $(TESTS) @echo "Valgrinding tests ..." @failed=0; \ for t in $(filter-out $(VALGRIND_TESTS_DISABLE),$(TESTS)); do \ - make $$t.valgrind; \ + $(MAKE) $$t.valgrind; \ if test "$$?" -ne 0; then \ echo "Valgrind error for test $$t"; \ failed=`expr $$failed + 1`; \ diff --git a/rules/lcov.mak b/rules/lcov.mak index 3a879351..1c04d45b 100644 --- a/rules/lcov.mak +++ b/rules/lcov.mak @@ -2,18 +2,18 @@ COVERAGE_DIR=coverage # run lcov from scratch, always lcov-reset: - make lcov-run - make lcov-report + $(MAKE) lcov-run + $(MAKE) lcov-report # run lcov from scratch if the dir is not there lcov: - make lcov-reset + $(MAKE) lcov-reset # reset run coverage tests lcov-run: @-rm -rf $(COVERAGE_DIR) @-find . -name "*.gcda" -exec rm {} \; - -make check + -$(MAKE) check # generate report based on current coverage data lcov-report: |