diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-05-22 19:43:39 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-05-22 19:43:39 +0200 |
| commit | 4251d561c6d849a13078bcb878a3fd345590a325 (patch) | |
| tree | 6efcf28226cde1912b5fdc927d86719c2f0c4e41 /templates | |
| parent | 7a875f1a744dc3bb2f1a52a0e13e192d92d3dfc5 (diff) | |
Don't run flaky tests on make test.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 2da884e262..bc8f1bb1d0 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -767,9 +767,20 @@ buildtests_cxx: privatelibs_cxx\ test: test_c test_cxx +flaky_test: flaky_test_c flaky_test_cxx + test_c: buildtests_c % for tgt in targets: -% if tgt.build == 'test' and tgt.get('run', True) and not tgt.language == 'c++': +% if tgt.build == 'test' and tgt.get('run', True) and not tgt.language == 'c++' and not tgt.get('flaky', False): + $(E) "[RUN] Testing ${tgt.name}" + $(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 ) +% endif +% endfor + + +flaky_test_c: buildtests_c +% for tgt in targets: +% if tgt.build == 'test' and tgt.get('run', True) and not tgt.language == 'c++' and tgt.get('flaky', False): $(E) "[RUN] Testing ${tgt.name}" $(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 ) % endif @@ -778,7 +789,16 @@ test_c: buildtests_c test_cxx: buildtests_cxx % for tgt in targets: -% if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++': +% if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and not tgt.get('flaky', False): + $(E) "[RUN] Testing ${tgt.name}" + $(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 ) +% endif +% endfor + + +flaky_test_cxx: buildtests_cxx +% for tgt in targets: +% if tgt.build == 'test' and tgt.get('run', True) and tgt.language == 'c++' and tgt.get('flaky', False): $(E) "[RUN] Testing ${tgt.name}" $(Q) $(BINDIR)/$(CONFIG)/${tgt.name} || ( echo test ${tgt.name} failed ; exit 1 ) % endif |