Title: [208280] trunk/Tools
- Revision
- 208280
- Author
- carlo...@webkit.org
- Date
- 2016-11-02 06:38:54 -0700 (Wed, 02 Nov 2016)
Log Message
Unreviewed. Fix /webkit2/WebKitWebContext/get-plugins in the bots after r208273.
The test fails now if WEBKIT_TEST_PLUGIN_DIR contains symlinks, which is the case of the GTK+ bots.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
(testWebContextGetPlugins): Use realpath with WEBKIT_TEST_PLUGIN_DIR when building the expected plugins path.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (208279 => 208280)
--- trunk/Tools/ChangeLog 2016-11-02 13:18:46 UTC (rev 208279)
+++ trunk/Tools/ChangeLog 2016-11-02 13:38:54 UTC (rev 208280)
@@ -1,3 +1,12 @@
+2016-11-02 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Unreviewed. Fix /webkit2/WebKitWebContext/get-plugins in the bots after r208273.
+
+ The test fails now if WEBKIT_TEST_PLUGIN_DIR contains symlinks, which is the case of the GTK+ bots.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+ (testWebContextGetPlugins): Use realpath with WEBKIT_TEST_PLUGIN_DIR when building the expected plugins path.
+
2016-11-02 Romain Bellessort <romain.belless...@crf.canon.fr>
[Readable Streams API] Enable creation of ReadableByteStreamController
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (208279 => 208280)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2016-11-02 13:18:46 UTC (rev 208279)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2016-11-02 13:38:54 UTC (rev 208280)
@@ -22,6 +22,8 @@
#include "LoadTrackingTest.h"
#include "WebKitTestServer.h"
#include <gtk/gtk.h>
+#include <limits.h>
+#include <stdlib.h>
#include <webkit2/webkit2.h>
#include <wtf/HashMap.h>
#include <wtf/glib/GRefPtr.h>
@@ -171,7 +173,9 @@
}
g_assert(WEBKIT_IS_PLUGIN(testPlugin.get()));
- GUniquePtr<char> pluginPath(g_build_filename(WEBKIT_TEST_PLUGIN_DIR, "libTestNetscapePlugin.so", nullptr));
+ char normalizedPath[PATH_MAX];
+ g_assert(realpath(WEBKIT_TEST_PLUGIN_DIR, normalizedPath));
+ GUniquePtr<char> pluginPath(g_build_filename(normalizedPath, "libTestNetscapePlugin.so", nullptr));
g_assert_cmpstr(webkit_plugin_get_path(testPlugin.get()), ==, pluginPath.get());
g_assert_cmpstr(webkit_plugin_get_description(testPlugin.get()), ==, "Simple Netscape® plug-in that handles test content for WebKit");
GList* mimeInfoList = webkit_plugin_get_mime_info_list(testPlugin.get());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
