[cairo-commit] 2 commits - .gitlab-ci.yml test/Makefile.am

[GitLab Mirror]

 .gitlab-ci.yml   |    2 +-
 test/Makefile.am |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4804d073e6e197945ffe1852f0407e4364bc71be
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Nov 13 16:31:06 2018 +0100

    Remove all traces of NUM_THREADS
    
    The code that looked at CAIRO_TEST_NUM_THREADS was removed seven years
    ago in commit 6ef9779a6f5cb8, because it was dead code. I have not
    managed to figure out how long exactly this code was dead already.
    
    This commit removes the last traces of NUM_THREADS.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96c219f29..1c65440a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ stages:
 
   script:
     - ./autogen.sh
-    - make check TARGETS=image NUM_THREADS=8 VERBOSE=1
+    - make check TARGETS=image VERBOSE=1
 
   artifacts:
     when: on_failure
diff --git a/test/Makefile.am b/test/Makefile.am
index e3c42ea88..d69012b65 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -295,13 +295,12 @@ EXTRA_PROGRAMS += $(TESTS)
 TARGETS = $(CAIRO_TEST_TARGET)
 TARGETS_EXCLUDE = $(CAIRO_TEST_TARGET_EXCLUDE)
 FORMAT = $(CAIRO_TEST_TARGET_FORMAT)
-NUM_THREADS = $(CAIRO_TEST_NUM_THREADS)
 MODE = $(CAIRO_TEST_MODE)
 
 # Same about ENV vs CAIRO_TEST_ENV.  ENV is used with "make run" only
 ENV = $(CAIRO_TEST_ENV)
 
-TESTS_ENVIRONMENT = CAIRO_TEST_MODE="$(MODE)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_FORMAT="$(FORMAT)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)" CAIRO_TEST_NUM_THREADS="$(NUM_THREADS)" $(ENV)
+TESTS_ENVIRONMENT = CAIRO_TEST_MODE="$(MODE)" CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_TEST_TARGET_FORMAT="$(FORMAT)" CAIRO_TEST_TARGET_EXCLUDE="$(TARGETS_EXCLUDE)" $(ENV)
 
 EXTRA_VALGRIND_FLAGS = $(CAIRO_EXTRA_VALGRIND_FLAGS)
 VALGRIND_FLAGS = \
commit c62238a1dab67f05528c622047ce1e60c1a382e4
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Nov 13 16:24:19 2018 +0100

    .gitlab-ci.yml: Do a verbose build
    
    With VERBOSE=1, a lot more stuff is printed while make runs. Perhaps
    most interestingly, this prints the output of a failed test after the
    test failed. Thus, this gives us the output of the test suite.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2928eca44..96c219f29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ stages:
 
   script:
     - ./autogen.sh
-    - make check TARGETS=image NUM_THREADS=8
+    - make check TARGETS=image NUM_THREADS=8 VERBOSE=1
 
   artifacts:
     when: on_failure