summaryrefslogtreecommitdiff
path: root/tests/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-04 14:23:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-04 14:23:46 +0200
commitfac292b8cd4b1374471f0ab2900cdd242de3d1ef (patch)
treeddbf78c493a4f446a048ff3d670f36d1c96bb699 /tests/Makefile
parent491c52d3b077dc1f298322a719059398a5f76af8 (diff)
parent23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac (diff)
Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac'
* commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac': fate: explicitly set the default THREADS value Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
-rw-r--r--tests/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile
index a18148cc5f..dd015ed5cd 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,6 @@
FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
+THREADS = 1
VREF = tests/vsynth1/00.pgm
AREF = tests/data/asynth1.sw