Merge branch 'master' into client-side-windows

[~andy/gtk] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 468c97564ace6f29c69b8be5d8631e8bc3545b4f..48e440550c54069e2ae44afc910eb8e4bffef96a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,14 +1,13 @@
 ## Makefile.am for gtk+/tests
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =                                     \
-       -I$(top_srcdir)                         \
-       -I$(top_builddir)/gdk                   \
-       -I$(top_srcdir)/gdk                     \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED         \
-       -DGDK_DISABLE_DEPRECATED                \
-       -DGTK_DISABLE_DEPRECATED                \
-       $(GTK_DEBUG_FLAGS)                      \
+INCLUDES =                             \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/gdk           \
+       -I$(top_srcdir)/gdk             \
+       -DGDK_DISABLE_DEPRECATED        \
+       -DGTK_DISABLE_DEPRECATED        \
+       $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)
 
 DEPS =                                                                 \
@@ -25,30 +24,9 @@ if USE_X11
 testsocket_programs = testsocket testsocket_child
 endif
 
-TEST_PROGS                     += floatingtest
-floatingtest_DEPENDENCIES       = $(TEST_DEPS)
-floatingtest_LDADD              = $(LDADDS)
-TEST_PROGS                      += objecttests
-objecttests_SOURCES              = objecttests.c
-objecttests_LDADD                = $(LDADDS)
-objecttests_DEPENDENCIES         = $(TEST_DEPS)
-TEST_PROGS                      += autotestfilechooser
-autotestfilechooser_DEPENDENCIES = $(TEST_DEPS)
-autotestfilechooser_LDADD        = $(LDADDS)
-autotestfilechooser_SOURCES      = autotestfilechooser.c
-TEST_PROGS                      += buildertest
-buildertest_DEPENDENCIES        = $(TEST_DEPS)
-buildertest_LDADD               = $(LDADDS)
-buildertest_LDFLAGS             = -export-dynamic
-if OS_UNIX
-TEST_PROGS                      += defaultvaluetest
-endif
-defaultvaluetest_DEPENDENCIES   = $(TEST_DEPS)
-defaultvaluetest_LDADD                  = $(LDADDS)
-
 noinst_PROGRAMS =  $(TEST_PROGS)       \
-       autotestkeywords                \
        simple                          \
+       flicker                         \
        print-editor                    \
        testaccel                       \
        testassistant                   \
@@ -58,9 +36,11 @@ noinst_PROGRAMS =  $(TEST_PROGS)     \
        testcombo                       \
        testcombochange                 \
        testcellrenderertext            \
+       testclientmessage               \
        testdnd                         \
        testellipsise                   \
        testentrycompletion             \
+       testentryicons                  \
        testfilechooser                 \
        testfilechooserbutton           \
        testframe                       \
@@ -71,21 +51,23 @@ noinst_PROGRAMS =  $(TEST_PROGS)    \
        testinput                       \
        testmenus                       \
        testmenubars                    \
+       testmountoperation              \
        testmultidisplay                \
        testmultiscreen                 \
        testnotebookdnd                 \
        testnouiprint                   \
+       testoffscreen                   \
        testprint                       \
        testrgb                         \
        testrecentchooser               \
        testrecentchoosermenu           \
        testrichtext                    \
+       testscale                       \
        testselection                   \
        $(testsocket_programs)          \
        testspinbutton                  \
        teststatusicon                  \
        testtext                        \
-        testtextbuffer                 \
        testtoolbar                     \
        stresstest-toolbar              \
        testtreeedit                    \
@@ -94,9 +76,11 @@ noinst_PROGRAMS =  $(TEST_PROGS)     \
        testtreefocus                   \
        testtreeflow                    \
        testtreecolumns                 \
+       testtreecolumnsizing            \
        testtreesort                    \
        treestoretest                   \
        testxinerama                    \
+       testwindows                     \
        pixbuf-read                     \
        pixbuf-lowmem                   \
        pixbuf-randomly-modified        \
@@ -122,6 +106,7 @@ endif
 
 endif
 
+flicker_DEPENDENCIES = $(TEST_DEPS)
 simple_DEPENDENCIES = $(TEST_DEPS)
 print_editor_DEPENDENCIES = $(TEST_DEPS)
 testicontheme_DEPENDENCIES = $(TEST_DEPS)
@@ -135,9 +120,11 @@ testcalendar_DEPENDENCIES = $(TEST_DEPS)
 testcombo_DEPENDENCIES = $(TEST_DEPS)
 testcombochange_DEPENDENCIES = $(TEST_DEPS)
 testcellrenderertext_DEPENDENCIES = $(TEST_DEPS)
+testclientmessage_DEPENDENCIES = $(TEST_DEPS)
 testdnd_DEPENDENCIES = $(TEST_DEPS)
 testellipsise_DEPENDENCIES = $(TEST_DEPS)
 testentrycompletion_DEPENDENCIES = $(TEST_DEPS)
+testentryicons_DEPENDENCIES = $(TEST_DEPS)
 testfilechooser_DEPENDENCIES = $(TEST_DEPS)
 testfilechooserbutton_DEPENDENCIES = $(TEST_DEPS)
 testgtk_DEPENDENCIES = $(TEST_DEPS)
@@ -145,28 +132,31 @@ testinput_DEPENDENCIES = $(TEST_DEPS)
 testimage_DEPENDENCIES = $(TEST_DEPS)
 testmenus_DEPENDENCIES = $(TEST_DEPS)
 testmenubars_DEPENDENCIES = $(TEST_DEPS)
+testmountoperation_DEPENDENCIES = $(TEST_DEPS)
 testmultidisplay_DEPENDENCIES = $(TEST_DEPS)
 testmultiscreen_DEPENDENCIES = $(TEST_DEPS)
 testnotebookdnd_DEPENDENCIES = $(TEST_DEPS)
 testnouiprint_DEPENDENCIES = $(TEST_DEPS)
+testoffscreen_DEPENDENCIES = $(TEST_DEPS)
 testprint_DEPENDENCIES = $(TEST_DEPS)
 testrecentchooser_DEPENDENCIES = $(TEST_DEPS)
 testrecentchoosermenu_DEPENDENCIES = $(TEST_DEPS)
 testrgb_DEPENDENCIES = $(TEST_DEPS)
 testrichtext_DEPENDENCIES = $(TEST_DEPS)
+testscale_DEPENDENCIES = $(TEST_DEPS)
 testselection_DEPENDENCIES = $(TEST_DEPS)
 testsocket_DEPENDENCIES = $(DEPS)
 testsocket_child_DEPENDENCIES = $(DEPS)
 testspinbutton_DEPENDENCIES = $(TEST_DEPS)
 teststatusicon_DEPENDENCIES = $(TEST_DEPS)
 testtext_DEPENDENCIES = $(TEST_DEPS)
-testtextbuffer_DEPENDENCIES = $(TEST_DEPS)
 testtreeedit_DEPENDENCIES = $(DEPS)
 testtreemodel_DEPENDENCIES = $(DEPS)
 testtreeview_DEPENDENCIES = $(DEPS)
 testtreefocus_DEPENDENCIES = $(DEPS)
 testtreeflow_DEPENDENCIES = $(DEPS)
 testtreecolumns_DEPENDENCIES = $(DEPS)
+testtreecolumnsizing_DEPENDENCIES = $(DEPS)
 testtreesort_DEPENDENCIES = $(DEPS)
 treestoretest_DEPENDENCIES = $(TEST_DEPS)
 testxinerama_DEPENDENCIES = $(TEST_DEPS)
@@ -175,7 +165,9 @@ testactions_DEPENDENCIES = $(TEST_DEPS)
 testgrouping_DEPENDENCIES = $(TEST_DEPS)
 testtooltips_DEPENDENCIES = $(TEST_DEPS)
 testvolumebutton_DEPENDENCIES = $(TEST_DEPS)
+testwindows_DEPENDENCIES = $(TEST_DEPS)
 
+flicker_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
 print_editor_LDADD = $(LDADDS)
 testaccel_LDADD = $(LDADDS)
@@ -187,9 +179,11 @@ testcalendar_LDADD = $(LDADDS)
 testcombo_LDADD = $(LDADDS)
 testcombochange_LDADD = $(LDADDS)
 testcellrenderertext_LDADD = $(LDADDS)
+testclientmessage_LDADD = $(LDADDS)
 testdnd_LDADD = $(LDADDS)
 testellipsise_LDADD = $(LDADDS)
 testentrycompletion_LDADD = $(LDADDS)
+testentryicons_LDADD = $(LDADDS)
 testfilechooser_LDADD = $(LDADDS)
 testfilechooserbutton_LDADD = $(LDADDS)
 testgtk_LDADD = $(LDADDS)
@@ -199,21 +193,23 @@ testinput_LDADD = $(LDADDS)
 testimage_LDADD = $(LDADDS)
 testmenus_LDADD = $(LDADDS)
 testmenubars_LDADD = $(LDADDS)
+testmountoperation_LDADD = $(LDADDS)
 testmultidisplay_LDADD = $(LDADDS)
 testmultiscreen_LDADD = $(LDADDS)
 testnotebookdnd_LDADD = $(LDADDS)
 testnouiprint_LDADD = $(LDADDS)
+testoffscreen_LDADD = $(LDADDS)
 testprint_LDADD = $(LDADDS)
 testrecentchooser_LDADD = $(LDADDS)
 testrecentchoosermenu_LDADD = $(LDADDS)
 testrgb_LDADD = $(LDADDS)
 testrichtext_LDADD = $(LDADDS)
+testscale_LDADD = $(LDADDS)
 testselection_LDADD = $(LDADDS)
 testsocket_LDADD = $(LDADDS)
 testsocket_child_LDADD = $(LDADDS)
 testspinbutton_LDADD = $(LDADDS)
 teststatusicon_LDADD = $(LDADDS)
-testtextbuffer_LDADD = $(LDADDS)
 testtoolbar_LDADD = $(LDADDS)
 stresstest_toolbar_LDADD = $(LDADDS)
 testtreeedit_LDADD = $(LDADDS)
@@ -222,6 +218,7 @@ testtreeview_LDADD = $(LDADDS)
 testtreefocus_LDADD = $(LDADDS)
 testtreeflow_LDADD = $(LDADDS)
 testtreecolumns_LDADD = $(LDADDS)
+testtreecolumnsizing_LDADD = $(LDADDS)
 testtreesort_LDADD = $(LDADDS)
 testtext_LDADD = $(LDADDS)
 treestoretest_LDADD = $(LDADDS)
@@ -236,12 +233,17 @@ testactions_LDADD = $(LDADDS)
 testgrouping_LDADD = $(LDADDS)
 testtooltips_LDADD = $(LDADDS)
 testvolumebutton_LDADD = $(LDADDS)
+testwindows_LDADD = $(LDADDS)
 
 
 testentrycompletion_SOURCES =  \
        prop-editor.c           \
        testentrycompletion.c
 
+testentryicons_SOURCES =       \
+       prop-editor.c           \
+       testentryicons.c
+
 testfilechooser_SOURCES =      \
        prop-editor.c           \
        testfilechooser.c       
@@ -324,6 +326,14 @@ testrecentchoosermenu_SOURCES =    \
 testvolumebutton_SOURCES =     \
        testvolumebutton.c
 
+testoffscreen_SOURCES =        \
+       gtkoffscreenbox.c       \
+       gtkoffscreenbox.h       \
+       testoffscreen.c
+
+testwindow_SOURCES =   \
+       testwindows.c
+
 EXTRA_DIST +=                  \
        prop-editor.h           \
        testgtk.1               \
@@ -344,5 +354,9 @@ EXTRA_DIST +=                       \
        merge-2.ui              \
        merge-3.ui              \
        gnome-textfile.png      \
-       makefile.msc
+       makefile.msc            \
+       file-chooser-test-dir/empty \
+       file-chooser-test-dir/text.txt
+
 
+-include $(top_srcdir)/git.mk