[GTK] Move ImageDiff to the Tools directory root

https://bugs.webkit.org/show_bug.cgi?id=105421

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2012-12-31
Reviewed by Kenneth Rohde Christiansen.

.:

* GNUmakefile.am: Remove the old ImageDiff makefile include.

Tools:

* DumpRenderTree/gtk/GNUmakefile.ImageDiff.am: Removed.
* GNUmakefile.am:
* ImageDiff/gtk/ImageDiff.cpp: Renamed from Tools/DumpRenderTree/gtk/ImageDiff.cpp.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138595 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 8112f420
2012-12-31 Carlos Garcia Campos <cgarcia@igalia.com>
[GTK] Move ImageDiff to the Tools directory root
https://bugs.webkit.org/show_bug.cgi?id=105421
Reviewed by Kenneth Rohde Christiansen.
* GNUmakefile.am: Remove the old ImageDiff makefile include.
2012-12-30 Kondapally Kalyan <kalyan.kondapally@intel.com>
[EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.
......
......@@ -295,7 +295,6 @@ include Source/WebKit/gtk/GNUmakefile.am
include Source/WebCore/bindings/gobject/GNUmakefile.am
include Tools/GNUmakefile.am
include Source/WebKit/gtk/po/GNUmakefile.am
include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
include Source/WebKit2/GNUmakefile.am
include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
......
2012-12-31 Carlos Garcia Campos <cgarcia@igalia.com>
[GTK] Move ImageDiff to the Tools directory root
https://bugs.webkit.org/show_bug.cgi?id=105421
Reviewed by Kenneth Rohde Christiansen.
* DumpRenderTree/gtk/GNUmakefile.ImageDiff.am: Removed.
* GNUmakefile.am:
* ImageDiff/gtk/ImageDiff.cpp: Renamed from Tools/DumpRenderTree/gtk/ImageDiff.cpp.
2012-12-30 Mike West <mkwst@chromium.org>
Add myself to watchlists for CSP and console logs.
......
noinst_PROGRAMS += \
Programs/ImageDiff
Programs_ImageDiff_CPPFLAGS = $(global_cppflags)
Programs_ImageDiff_SOURCES = \
Tools/DumpRenderTree/gtk/ImageDiff.cpp
Programs_ImageDiff_CXXFLAGS = \
$(global_cxxflags) \
$(global_cppflags) \
$(Programs_ImageDiff_CFLAGS)
Programs_ImageDiff_CFLAGS = \
-fno-strict-aliasing \
$(global_cflags) \
$(GLOBALDEPS_CFLAGS) \
$(GTK_CFLAGS)
Programs_ImageDiff_LDADD = \
$(GTK_LIBS)
Programs_ImageDiff_LDFLAGS = \
-no-fast-install \
-no-install
CLEANFILES += \
Programs/ImageDiff
noinst_PROGRAMS += \
Programs/DumpRenderTree \
Programs/GtkLauncher
Programs/GtkLauncher \
Programs/ImageDiff
# GtkLauncher
Programs_GtkLauncher_CPPFLAGS = \
......@@ -185,10 +186,35 @@ Programs_DumpRenderTree_LDFLAGS = \
-no-fast-install \
-no-install
# ImageDiff
Programs_ImageDiff_CPPFLAGS = $(global_cppflags)
Programs_ImageDiff_SOURCES = \
Tools/ImageDiff/gtk/ImageDiff.cpp
Programs_ImageDiff_CXXFLAGS = \
$(global_cxxflags) \
$(global_cppflags) \
$(Programs_ImageDiff_CFLAGS)
Programs_ImageDiff_CFLAGS = \
-fno-strict-aliasing \
$(global_cflags) \
$(GLOBALDEPS_CFLAGS) \
$(GTK_CFLAGS)
Programs_ImageDiff_LDADD = \
$(GTK_LIBS)
Programs_ImageDiff_LDFLAGS = \
-no-fast-install \
-no-install
# clean target
CLEANFILES += \
Programs/DumpRenderTree \
Programs/GtkLauncher
Programs/GtkLauncher \
Programs/ImageDiff
if TARGET_X11
......
......@@ -171,9 +171,8 @@ void printImageDifferences(GdkPixbuf* baselineImage, GdkPixbuf* actualImage)
g_object_unref(differenceImage);
}
printf("diff: %01.2f%% failed\n", difference);
} else {
} else
printf("diff: %01.2f%% passed\n", difference);
}
}
int main(int argc, char* argv[])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment