Merge lp:~midori/midori/containAtExecutionTime into lp:midori

[Cris Dywan]

Use dependencies to clear test folders before execution

[lp:~midori/midori/containAtExecutionTime]

6648. By Cris Dywan on 2014-04-04

Execute extension tests separately from CMake

6649. By Paweł Forysiuk on 2014-04-04

Swap cache and config folder variables as per alphabetic order

[André Stösel (ivaldi)]

looks good :)

review: Approve

=== modified file 'cmake/ContainTest.cmake'
--- cmake/ContainTest.cmake	2014-01-26 21:48:37 +0000
+++ cmake/ContainTest.cmake	2014-04-04 21:57:24 +0000
@@ -2,26 +2,37 @@
 
 include(ParseArguments)
 
-macro(contain_test test_name)
-    parse_arguments(ARGS "TEST" "" ${ARGN})
+macro(contain_test test_name executable)
+    parse_arguments(ARGS "test_name;executable" "" ${ARGN})
     set(TEST_ENV "")
-    foreach(VARIABLE XDG_DATA_HOME XDG_CONFIG_HOME XDG_CACHE_HOME XDG_DATA_HOME XDG_RUNTIME_DIR TMPDIR)
+    foreach(VARIABLE XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR TMPDIR)
         set(CONTAINER "${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/${VARIABLE}")
-        file(REMOVE_RECURSE ${CONTAINER})
-        file(MAKE_DIRECTORY ${CONTAINER})
         set(TEST_ENV "${TEST_ENV}${VARIABLE}=${CONTAINER};")
     endforeach()
+
+    add_dependencies(check contain-${test_name})
+
     set_tests_properties(${test_name} PROPERTIES
                          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                          TIMEOUT 42
                          ENVIRONMENT "${TEST_ENV}"
                          )
+    add_custom_target("contain-${test_name}"
+        COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/XDG_CACHE_HOME
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/XDG_CONFIG_HOME
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/XDG_DATA_HOME
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/XDG_RUNTIME_DIR
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${test_name}-folders/TMPDIR
+        )
 
+    string(REPLACE ${executable} ";" " " executable)
     add_custom_target("gdb-${test_name}"
         COMMAND env ${TEST_ENV} gdb
         --batch -ex 'set print thread-events off'
         -ex 'run' -ex 'bt'
-        ${CMAKE_BINARY_DIR}/tests/${UNIT}
+        --args ${executable}
+        DEPENDS "contain-${test_name}"
         )
 
     add_custom_target("valgrind-${test_name}"
@@ -30,13 +41,15 @@
         --show-possibly-lost=no
         --undef-value-errors=yes
         --track-origins=yes
-        ${CMAKE_BINARY_DIR}/tests/${UNIT}
+        ${executable}
+        DEPENDS "contain-${test_name}"
         )
 
     add_custom_target("callgrind-${test_name}"
         COMMAND env ${TEST_ENV} valgrind
         --tool=callgrind
         --callgrind-out-file=${UNIT}.callgrind
-        ${CMAKE_BINARY_DIR}/tests/${UNIT}
+        ${executable}
+        DEPENDS "contain-${test_name}"
         )
 endmacro(contain_test)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-10-01 21:35:39 +0000
+++ tests/CMakeLists.txt	2014-04-04 21:57:24 +0000
@@ -46,9 +46,20 @@
                           ${LIBMIDORI}
                           )
     add_test(NAME ${UNIT} COMMAND ${UNIT})
-    contain_test (${UNIT})
+    contain_test (${UNIT} ${UNIT})
 endforeach ()
 
+file(GLOB TESTS ${CMAKE_BINARY_DIR}/extensions/lib*.so)
+foreach(UNIT ${TESTS})
+    string(REPLACE ${CMAKE_BINARY_DIR} "" TEST ${UNIT})
+    string(REPLACE "/" "-" TEST ${TEST})
+    string(REPLACE "-extensions-lib" "" TEST ${TEST})
+    string(REPLACE ".so" "" TEST ${TEST})
+    add_test(NAME ${TEST} COMMAND $<TARGET_FILE:extensions> -e ${UNIT})
+    set(exe $<TARGET_FILE:extensions> -e ${UNIT})
+    contain_test (${TEST} "${exe}")
+endforeach()
+
 file(GLOB TESTS *.sh)
 foreach(UNIT_SRC ${TESTS})
     string(REPLACE ".sh" "" UNIT ${UNIT_SRC})

=== modified file 'tests/extensions.c'
--- tests/extensions.c	2014-01-25 21:04:57 +0000
+++ tests/extensions.c	2014-04-04 21:57:24 +0000
@@ -176,12 +176,11 @@
 }
 
 static void
-extension_load (const gchar* extension_path,
-                GDir*        extension_dir)
+extension_load (const gchar* absolute_filename)
 {
-    const gchar* filename;
-    while ((filename = g_dir_read_name (extension_dir)))
-    {
+    g_assert (g_access (absolute_filename, F_OK) == 0);
+    gchar* extension_path = g_path_get_dirname (absolute_filename);
+    gchar* filename = g_path_get_basename (absolute_filename);
         GObject* extension = midori_extension_load_from_file (extension_path, filename, FALSE, TRUE);
         if (KATZE_IS_ARRAY (extension))
         {
@@ -202,7 +201,6 @@
             g_test_add_data_func (path, extension, extension_activate);
             g_free (path);
         }
-    }
 }
 
 static void
@@ -217,29 +215,32 @@
       char** argv)
 {
     midori_test_init (&argc, &argv);
-    midori_app_setup (&argc, &argv, NULL);
+    gchar* extension;
+    GOptionEntry entries[] = {
+        { "extension", 'e', 0, G_OPTION_ARG_STRING, &extension,
+          "Execute cases defined in extension_init", "EXTENSION" },
+        { NULL }
+    };
+    extension = NULL;
+    midori_app_setup (&argc, &argv, entries);
     midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
     #ifndef HAVE_WEBKIT2
     soup_session_add_feature_by_type (webkit_get_default_session (),
         SOUP_TYPE_COOKIE_JAR);
     #endif
 
-    g_test_add_func ("/extensions/create", extension_create);
-    g_test_add_func ("/extensions/settings", extension_settings);
-    g_test_add_func ("/extensions/config", extension_config);
-
-    if (g_module_supported ())
-    {
-        gchar* extension_path = midori_paths_get_lib_path (PACKAGE_NAME);
-        GDir* extension_dir = g_dir_open (extension_path, 0, NULL);
-        g_assert (extension_dir != NULL);
-
+    if (extension == NULL)
+    {
+        g_test_add_func ("/extensions/create", extension_create);
+        g_test_add_func ("/extensions/settings", extension_settings);
+        g_test_add_func ("/extensions/config", extension_config);
+    }
+    else
+    {
+        g_assert (g_module_supported ());
         /* We require that extensions can be loaded repeatedly */
-        extension_load (extension_path, extension_dir);
-        extension_load (extension_path, extension_dir);
-
-        g_dir_close (extension_dir);
-        g_free (extension_path);
+        extension_load (extension);
+        extension_load (extension);
     }
 
     return g_test_run ();