Title: [149195] trunk/Tools
- Revision
- 149195
- Author
- zandober...@gmail.com
- Date
- 2013-04-26 10:41:17 -0700 (Fri, 26 Apr 2013)
Log Message
[GTK] Clean up the TestWebKitAPI GNUmakefile.am
https://bugs.webkit.org/show_bug.cgi?id=115233
Reviewed by Martin Robinson.
Specify unconditional, non-installable program targets in one declaration. Only conditionally specify
WebKit2-specific targets, not the complete target setups (i.e. targets' sources, cppflags listings etc.).
Add missing unit test source files to the TestWTF program, namely HashSet.cpp and MetaAllocator.cpp.
Specify the TestWTF program's CXXFLAGS to be the same as the global cxxflags as the source files need to
be compiled with the -fno-rtti flag that's present in the global_cxxflags variable.
* TestWebKitAPI/GNUmakefile.am:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (149194 => 149195)
--- trunk/Tools/ChangeLog 2013-04-26 16:55:12 UTC (rev 149194)
+++ trunk/Tools/ChangeLog 2013-04-26 17:41:17 UTC (rev 149195)
@@ -1,3 +1,18 @@
+2013-04-26 Zan Dobersek <zdober...@igalia.com>
+
+ [GTK] Clean up the TestWebKitAPI GNUmakefile.am
+ https://bugs.webkit.org/show_bug.cgi?id=115233
+
+ Reviewed by Martin Robinson.
+
+ Specify unconditional, non-installable program targets in one declaration. Only conditionally specify
+ WebKit2-specific targets, not the complete target setups (i.e. targets' sources, cppflags listings etc.).
+ Add missing unit test source files to the TestWTF program, namely HashSet.cpp and MetaAllocator.cpp.
+ Specify the TestWTF program's CXXFLAGS to be the same as the global cxxflags as the source files need to
+ be compiled with the -fno-rtti flag that's present in the global_cxxflags variable.
+
+ * TestWebKitAPI/GNUmakefile.am:
+
2013-04-25 Andy Estes <aes...@apple.com>
[WebKit2] Loading a resource from a custom protocol in a synchronous XHR times out
Modified: trunk/Tools/TestWebKitAPI/GNUmakefile.am (149194 => 149195)
--- trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-04-26 16:55:12 UTC (rev 149194)
+++ trunk/Tools/TestWebKitAPI/GNUmakefile.am 2013-04-26 17:41:17 UTC (rev 149195)
@@ -20,13 +20,22 @@
$(GTK_CFLAGS)
noinst_PROGRAMS += \
- Programs/TestWebKitAPI/TestWTF
+ Programs/TestWebKitAPI/TestWTF \
+ Programs/TestWebKitAPI/TestGtk
+if ENABLE_WEBKIT2
+noinst_PROGRAMS += \
+ Programs/TestWebKitAPI/TestWebKit2
+endif # ENABLE_WEBKIT2
+
Programs_TestWebKitAPI_TestWTF_CPPFLAGS = \
$(Libraries_libTestWebKitAPIMain_la_CPPFLAGS) \
$(GLIB_LIBS) \
$(CAIRO_CFLAGS)
+Programs_TestWebKitAPI_TestWTF_CXXFLAGS = \
+ $(global_cxxflags)
+
Programs_TestWebKitAPI_TestWTF_LDADD = \
Libraries/libTestWebKitAPIMain.la \
Libraries/libgtest.la \
@@ -44,10 +53,12 @@
Tools/TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp \
Tools/TestWebKitAPI/Tests/WTF/Functional.cpp \
Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp \
+ Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp \
Tools/TestWebKitAPI/Tests/WTF/IntegerToStringConversion.cpp \
Tools/TestWebKitAPI/Tests/WTF/ListHashSet.cpp \
Tools/TestWebKitAPI/Tests/WTF/MathExtras.cpp \
Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp \
+ Tools/TestWebKitAPI/Tests/WTF/MetaAllocator.cpp \
Tools/TestWebKitAPI/Tests/WTF/RedBlackTree.cpp \
Tools/TestWebKitAPI/Tests/WTF/SaturatedArithmeticOperations.cpp \
Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp \
@@ -55,14 +66,11 @@
Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp \
Tools/TestWebKitAPI/Tests/WTF/StringOperators.cpp \
Tools/TestWebKitAPI/Tests/WTF/TemporaryChange.cpp \
+ Tools/TestWebKitAPI/Tests/WTF/Vector.cpp \
Tools/TestWebKitAPI/Tests/WTF/VectorBasic.cpp \
- Tools/TestWebKitAPI/Tests/WTF/Vector.cpp \
Tools/TestWebKitAPI/Tests/WTF/VectorReverse.cpp \
Tools/TestWebKitAPI/WTFStringUtilities.h
-noinst_PROGRAMS += \
- Programs/TestWebKitAPI/TestGtk
-
Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
$(platformgtk_cppflags) \
@@ -96,10 +104,6 @@
Tools/TestWebKitAPI/config.h \
Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp
-if ENABLE_WEBKIT2
-noinst_PROGRAMS += \
- Programs/TestWebKitAPI/TestWebKit2
-
Programs_TestWebKitAPI_TestWebKit2_CPPFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
-I$(top_builddir)/DerivedSources/WebKit2/include \
@@ -173,8 +177,10 @@
Tools/TestWebKitAPI/Tests/WebKit2/WKString.cpp \
Tools/TestWebKitAPI/Tests/WebKit2/WKStringJSString.cpp
+if ENABLE_WEBKIT2
noinst_LTLIBRARIES += \
Libraries/libTestWebKitAPIInjectedBundle.la
+endif # ENABLE_WEBKIT2
Libraries_libTestWebKitAPIInjectedBundle_la_SOURCES = \
Tools/TestWebKitAPI/InjectedBundleController.cpp \
@@ -227,8 +233,8 @@
$(AM_V_GEN)$(PERL) $< $(srcdir)/Tools/TestWebKitAPI $(GENSOURCES_WEBKIT2)/include gtk \
&& echo timestamp > $(@F)
+if ENABLE_WEBKIT2
BUILT_SOURCES += $(top_builddir)/stamp-testwebkitapi-forwarding-headers
-
endif # ENABLE_WEBKIT2
EXTRA_DIST += \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
