diff options
author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
---|---|---|
committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
commit | 41386e9cb918eed93b3f13648cbef387e371e451 (patch) | |
tree | a97f9d7bd1d9d091833286085f72da9d83fd0606 /Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp | |
parent | e15dd966d523731101f70ccf768bba12435a0208 (diff) | |
download | WebKitGtk-tarball-41386e9cb918eed93b3f13648cbef387e371e451.tar.gz |
webkitgtk-2.4.9webkitgtk-2.4.9
Diffstat (limited to 'Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp')
-rw-r--r-- | Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp b/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp index 80809400d..61331a3d3 100644 --- a/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp +++ b/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp @@ -22,19 +22,12 @@ #include <glib/gstdio.h> #include <gtk/gtk.h> - -uint32_t Test::s_webExtensionID = 0; +#include <webkit2/webkit2.h> +#include <wtf/gobject/GUniquePtr.h> void beforeAll(); void afterAll(); -static GUniquePtr<char> testDataDirectory(g_dir_make_tmp("WebKit2GtkTests-XXXXXX", nullptr)); - -const char* Test::dataDirectory() -{ - return testDataDirectory.get(); -} - static void registerGResource(void) { GUniquePtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", "resources", "webkit2gtk-tests-resources.gresource", nullptr)); @@ -52,10 +45,7 @@ static void removeNonEmptyDirectory(const char* directoryPath) const char* fileName; while ((fileName = g_dir_read_name(directory))) { GUniquePtr<char> filePath(g_build_filename(directoryPath, fileName, nullptr)); - if (g_file_test(filePath.get(), G_FILE_TEST_IS_DIR)) - removeNonEmptyDirectory(filePath.get()); - else - g_unlink(filePath.get()); + g_unlink(filePath.get()); } g_dir_close(directory); g_rmdir(directoryPath); @@ -76,12 +66,15 @@ int main(int argc, char** argv) registerGResource(); + GUniquePtr<char> diskCacheTempDirectory(g_dir_make_tmp("WebKit2TestsDiskCache-XXXXXX", 0)); + g_assert(diskCacheTempDirectory.get()); + webkit_web_context_set_disk_cache_directory(webkit_web_context_get_default(), diskCacheTempDirectory.get()); + beforeAll(); int returnValue = g_test_run(); afterAll(); - removeNonEmptyDirectory(testDataDirectory.get()); + removeNonEmptyDirectory(diskCacheTempDirectory.get()); return returnValue; } - |