summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUli Schlachter <psychon@znc.in>2018-11-13 16:31:06 +0100
committerUli Schlachter <psychon@znc.in>2018-12-16 09:53:07 +0100
commit4804d073e6e197945ffe1852f0407e4364bc71be (patch)
tree5fecf768e7254f0bc4c78a2dd68a82e5b516e895
parentc62238a1dab67f05528c622047ce1e60c1a382e4 (diff)
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@znc.in>
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--test/Makefile.am3
2 files changed, 2 insertions, 3 deletions
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 = \