diff options
-rw-r--r-- | .gitlab-ci.yml | 9 | ||||
-rw-r--r-- | testsuite/driver/runtests.py | 2 | ||||
-rw-r--r-- | testsuite/mk/test.mk | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 032966b5e2..5d399d6f92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,15 @@ ghc-linters: refs: - merge_requests +lint-testsuite: + stage: lint + image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb9:$DOCKER_REV" + script: + - make -Ctestsuite list_broken TEST_HC=ghc + dependencies: [] + tags: + - lint + # We allow the submodule checker to fail when run on merge requests (to # accomodate, e.g., haddock changes not yet upstream) but not on `master` or # Marge jobs. diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py index 107bd77696..b0013c4631 100644 --- a/testsuite/driver/runtests.py +++ b/testsuite/driver/runtests.py @@ -350,7 +350,7 @@ for name in config.only: if config.list_broken: print('') print('Broken tests:') - print(' '.join(map (lambda bdn: '#' + str(bdn[0]) + '(' + bdn[1] + '/' + bdn[2] + ')', brokens))) + print('\n '.join(map (lambda bdn: '#' + str(bdn[0]) + '(' + bdn[1] + '/' + bdn[2] + ')', brokens))) print('') if t.framework_failures: diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 6860974c54..be6b741751 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -81,7 +81,11 @@ endif RUNTEST_OPTS += -e "ghc_compiler_always_flags='$(TEST_HC_OPTS)'" -RUNTEST_OPTS += -e config.compiler_debugged=$(GhcDebugged) +ifeq "$(GhcDebugged)" "YES" +RUNTEST_OPTS += -e "config.compiler_debugged=True" +else +RUNTEST_OPTS += -e "config.compiler_debugged=False" +endif ifeq "$(GhcWithNativeCodeGen)" "YES" RUNTEST_OPTS += -e ghc_with_native_codegen=True |