virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

avutil/tests: run the cpu_init.c test conditionally on HAVE_THREADS

Browse Source 
Suggested by Diego Biurrun and James Almer.

Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Wan-Teh Chang 2016-12-06 11:00:02 -08:00 committed by James Almer
parent 8986885801
commit 3703f13333
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/Makefile
View File

@ -190,7 +190,6 @@ TESTPROGS = adler32 \
camellia \ camellia \
color_utils \ color_utils \
cpu \ cpu \
cpu_init \
crc \ crc \
des \ des \
dict \ dict \
@ -226,6 +225,7 @@ TESTPROGS = adler32 \
tea \ tea \
TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
TESTPROGS-$(HAVE_THREADS) += cpu_init
TOOLS = crypto_bench ffhash ffeval ffescape TOOLS = crypto_bench ffhash ffeval ffescape

7
libavutil/tests/cpu_init.c
View File

@ -24,12 +24,9 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "config.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/thread.h" #include "libavutil/thread.h"
#if HAVE_PTHREADS
static void *thread_main(void *arg) static void *thread_main(void *arg)
{ {
int *flags = arg; int *flags = arg;
@ -37,12 +34,9 @@ static void *thread_main(void *arg)
*flags = av_get_cpu_flags(); *flags = av_get_cpu_flags();
return NULL; return NULL;
} }
#endif
int main(void) int main(void)
{ {
#if HAVE_PTHREADS
int cpu_flags1; int cpu_flags1;
int cpu_flags2; int cpu_flags2;
int ret; int ret;
@ -66,7 +60,6 @@ int main(void)
return 2; return 2;
if (cpu_flags1 != cpu_flags2) if (cpu_flags1 != cpu_flags2)
return 3; return 3;
#endif
return 0; return 0;
} }

2
tests/fate/libavutil.mak
View File

@ -44,7 +44,7 @@ fate-cpu: libavutil/tests/cpu$(EXESUF)
fate-cpu: CMD = runecho libavutil/tests/cpu $(CPUFLAGS:%=-c%) $(THREADS:%=-t%) fate-cpu: CMD = runecho libavutil/tests/cpu $(CPUFLAGS:%=-c%) $(THREADS:%=-t%)
fate-cpu: REF = /dev/null fate-cpu: REF = /dev/null
FATE_LIBAVUTIL += fate-cpu_init FATE_LIBAVUTIL-$(HAVE_THREADS) += fate-cpu_init
fate-cpu_init: libavutil/tests/cpu_init$(EXESUF) fate-cpu_init: libavutil/tests/cpu_init$(EXESUF)
fate-cpu_init: CMD = run libavutil/tests/cpu_init fate-cpu_init: CMD = run libavutil/tests/cpu_init
fate-cpu_init: REF = /dev/null fate-cpu_init: REF = /dev/null