diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 83 | ||||
| -rw-r--r-- | tests/core_get_client_auth.c | 4 | ||||
| -rw-r--r-- | tests/gem_exec_nop.c | 4 |
3 files changed, 1 insertions, 90 deletions
diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index c6e966fa..00000000 --- a/tests/Android.mk +++ /dev/null @@ -1,83 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/Makefile.sources - -#================# -# each igt test is a separate executable. define a function to build one of these tests -define add_test - include $(CLEAR_VARS) - - # specific to this test - LOCAL_SRC_FILES := $1.c - LOCAL_MODULE := $1 - - # common to all tests - LOCAL_CFLAGS += ${IGT_LOCAL_CFLAGS} - LOCAL_C_INCLUDES = ${IGT_LOCAL_C_INCLUDES} - LOCAL_STATIC_LIBRARIES := ${IGT_LOCAL_STATIC_LIBRARIES} - LOCAL_SHARED_LIBRARIES := ${IGT_LOCAL_SHARED_LIBRARIES} - - LOCAL_MODULE_TAGS := optional - # ask linker to define a specific symbol; we use this to identify IGT tests - LOCAL_LDFLAGS := -Wl,--defsym=$2=0 -lkmod - LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/intel/validation/core/igt - - include $(BUILD_EXECUTABLE) -endef - - -# some tests still do not build under android -skip_tests_list := -skip_tests_list += testdisplay # needs glib.h -skip_tests_list += pm_rpm - -# set local compilation flags for IGT tests -IGT_LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -DANDROID -UNDEBUG -IGT_LOCAL_CFLAGS += -include "check-ndebug.h" -std=gnu99 -# FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit -IGT_LOCAL_CFLAGS += -Wno-error=return-type -# Excessive complaining for established cases. Rely on the Linux version warnings. -IGT_LOCAL_CFLAGS += -Wno-sign-compare - -# set local includes -IGT_LOCAL_C_INCLUDES = $(LOCAL_PATH)/../lib \ - $(LOCAL_PATH)/../lib/stubs/drm/ - -# set local libraries -IGT_LOCAL_STATIC_LIBRARIES := libintel_gpu_tools -IGT_LOCAL_SHARED_LIBRARIES := libpciaccess libkmod libdrm libdrm_intel - -# handle cairo requirements if it is enabled -ifeq ("${ANDROID_HAS_CAIRO}", "1") - IGT_LOCAL_C_INCLUDES += ${ANDROID_BUILD_TOP}/external/cairo-1.12.16/src - IGT_LOCAL_SHARED_LIBRARIES += libcairo - IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=1 -else -# the following tests depend on cairo, so skip them - skip_tests_list += \ - gem_render_copy \ - pm_lpsp \ - drm_read \ - gem_exec_blt \ - perf \ - prime_mmap_kms - -# All kms tests depend on cairo - tmp_list := $(foreach test_name, $(TESTS_progs),\ - $(if $(findstring kms_,$(test_name)),$(test_name))) - skip_tests_list += $(tmp_list) - - tmp_list := $(foreach test_name, $(TESTS_progs_M),\ - $(if $(findstring kms_,$(test_name)),$(test_name))) - skip_tests_list += $(tmp_list) - - IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0 -endif - -# create two test lists, one for simple single tests, one for tests that have subtests -tests_list := $(filter-out $(skip_tests_list),$(TESTS_progs) $(HANG) $(TESTS_testsuite)) -tests_list_M := $(filter-out $(skip_tests_list),$(TESTS_progs_M)) - -$(foreach item,$(tests_list),$(eval $(call add_test,$(item),"IGT_SINGLE_TEST"))) -$(foreach item,$(tests_list_M),$(eval $(call add_test,$(item),"IGT_MULTI_TEST"))) - diff --git a/tests/core_get_client_auth.c b/tests/core_get_client_auth.c index 676083d5..9c64699d 100644 --- a/tests/core_get_client_auth.c +++ b/tests/core_get_client_auth.c @@ -51,12 +51,10 @@ is_local_tid(pid_t tid) { #ifndef __linux__ return pthread_self() == tid; -#elif !defined(ANDROID) +#else /* On Linux systems, drmGetClient() would return the thread ID instead of the actual process ID */ return syscall(SYS_gettid) == tid; -#else - return gettid() == tid; #endif } diff --git a/tests/gem_exec_nop.c b/tests/gem_exec_nop.c index c9280795..b5f15807 100644 --- a/tests/gem_exec_nop.c +++ b/tests/gem_exec_nop.c @@ -142,7 +142,6 @@ stable_nop_on_ring(int fd, uint32_t handle, unsigned int engine, return n; } -#if !defined(ANDROID) || ANDROID_HAS_CAIRO #define assert_within_epsilon(x, ref, tolerance) \ igt_assert_f((x) <= (1.0 + tolerance) * ref && \ (x) >= (1.0 - tolerance) * ref, \ @@ -187,7 +186,6 @@ static void headless(int fd, uint32_t handle) /* check that the two execution speeds are roughly the same */ assert_within_epsilon(n_headless, n_display, 0.1f); } -#endif static bool ignore_engine(int fd, unsigned engine) { @@ -710,13 +708,11 @@ igt_main } } -#if !defined(ANDROID) || ANDROID_HAS_CAIRO igt_subtest("headless") { /* Requires master for changing display modes */ igt_require(drmSetMaster(device) == 0); headless(device, handle); } -#endif igt_fixture { igt_stop_hang_detector(); |