X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=apps%2Fgl%2FCMakeLists.txt;h=ba8ad164f0a47e5cd8403637cf33039243988d4a;hb=892bd3001be0210549c8dd47655b253d6b2ff113;hp=42688190138f936d2233ae46c4651021656f4cce;hpb=7acb60aa5e6b9c2d905c64a1416d222c83bd9e79;p=apitrace-tests

diff --git a/apps/gl/CMakeLists.txt b/apps/gl/CMakeLists.txt
index 4268819..ba8ad16 100644
--- a/apps/gl/CMakeLists.txt
+++ b/apps/gl/CMakeLists.txt
@@ -11,7 +11,7 @@ link_libraries (
     ${OPENGL_gl_LIBRARY}
 )
 
-set (subdir gl)
+set (api gl)
 
 set (targets
     tri
@@ -19,61 +19,36 @@ set (targets
     varray
 )
 
-function (ADD_APP_TEST)
-    cmake_parse_arguments(
-        TEST
-        # Options
-        ""
-        # One value args
-        "NAME;TARGET;REF"
-        # Multi value args
-        "ARGS"
-        ${ARGN}
-    )
-
-    add_test(
-        NAME ${TEST_NAME}
-        COMMAND
-        python ${CMAKE_SOURCE_DIR}/driver.py
-            --build ${APITRACE_BINARY_DIR}
-            --ref-dump ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_REF}
-            "$<TARGET_FILE:${TEST_TARGET}>"
-            ${TEST_ARGS}
-    )
-endfunction ()
-
 foreach (target ${targets})
-    add_executable (${subdir}_${target} ${target}.c)
-    set_target_properties (${subdir}_${target} PROPERTIES OUTPUT_NAME ${target})
+    add_executable (${api}_${target} ${target}.c)
+    set_target_properties (${api}_${target} PROPERTIES OUTPUT_NAME ${target})
 
     if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${target}.ref.txt)
-        add_test(
-            NAME ${subdir}_${target}
-            COMMAND python ${CMAKE_SOURCE_DIR}/driver.py
-                --build ${APITRACE_BINARY_DIR}
-                --ref-dump ${CMAKE_CURRENT_SOURCE_DIR}/${target}.ref.txt
-                "$<TARGET_FILE:${subdir}_${target}>"
+        add_app_test(
+            NAME ${api}_${target}
+	    TARGET ${api}_${target}
+	    REF ${target}.ref.txt
         )
     endif ()
 endforeach (target)
 
 add_app_test (
     NAME "gl_varray_drawarrays"
-    TARGET ${subdir}_varray
+    TARGET ${api}_varray
     REF varray_drawarrays.ref.txt
     ARGS pointer drawarrays
 )
 
 add_app_test (
     NAME "gl_varray_elements"
-    TARGET ${subdir}_varray
+    TARGET ${api}_varray
     REF varray_drawelements.ref.txt
     ARGS pointer drawelements
 )
 
 add_app_test (
     NAME "gl_varray_interleaved"
-    TARGET ${subdir}_varray
+    TARGET ${api}_varray
     REF varray_interleaved.ref.txt
     ARGS interleaved drawarrays
 )