[2/2] Remove all traces of NUM_THREADS

Submitted by Uli Schlachter on Nov. 13, 2018, 3:33 p.m.

Details

Message ID ac2d0e45-cbe7-7305-9f53-830dd6a9d5b5@znc.in
State New
Series "Series without cover letter"
Headers show

Commit Message

Uli Schlachter Nov. 13, 2018, 3:33 p.m.
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@znc.in>
---
 .gitlab-ci.yml   | 2 +-
 test/Makefile.am | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 = \

Patch hide | download patch | download mbox

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)"