2008-07-21 Mark Doffman <mark.doffman@codethink.co.uk>

	* tests/clients -> tests/cspi & tests/pyatspi
	Separate client test code into cspi and pyatspi
	folders.

diff --git a/configure.ac b/configure.ac
index 99d923c..9e45e2b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,8 @@ AC_CONFIG_FILES([Makefile
                 atk-adaptor/Makefile
                 login-helper/Makefile
                 tests/dummyatk/Makefile
-                tests/clients/Makefile
+                tests/cspi/Makefile
+                tests/pyatspi/Makefile
                 tests/apps/Makefile
                 dbind/Makefile
                 cspi/Makefile

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f272bb9..72dbf0b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
-SUBDIRS = dummyatk apps clients
+SUBDIRS = dummyatk apps cspi pyatspi
 EXTRA_DIST = testrunner.py runtests.sh
 
-TESTS=testrunner.py
+#TESTS=testrunner.py
 TESTS_ENVIRONMENT = PYTHONPATH=$(abs_top_srcdir)/python                                        \
                    ATSPI_INTROSPECTION_PATH=$(top_srcdir)/xml/introspection            \
                    TEST_DATA_DIRECTORY=$(abs_top_srcdir)/tests/data                    \

diff --git a/tests/clients/Makefile.am b/tests/cspi/Makefile.am
similarity index 51%
rename from tests/clients/Makefile.am
rename to tests/cspi/Makefile.am
index a54de37..c5978b6 100644 (file)
--- a/tests/clients/Makefile.am
+++ b/tests/cspi/Makefile.am
@@ -1,11 +1,3 @@
-EXTRA_DIST = \
-       __init__.py             \
-       accessibleobject.py     \
-       component.py            \
-       testutil.py
-
-CLEANFILES = *.pyc
-
 noinst_PROGRAMS = key-listener-test keysynth-test simple-at
 
 key_listener_test_SOURCES = key-listener-test.c 
@@ -20,5 +12,6 @@ INCLUDES = -I$(top_srcdir)           \
           $(ATK_CFLAGS)             \
           $(DEBUG_CFLAGS)
 
-#LDADD = ../spi-common/libspicommon.la ../cspi/libcspi.la ../login-helper/libloginhelper.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS)
-LDADD = ../../spi-common/libspicommon.la ../../cspi/libcspi.la $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) $(ATK_LIBS) $(GTK_LIBS)
+LDADD = $(top_builddir)/spi-common/libspicommon.la                     \
+       $(top_builddir)/cspi/libcspi.la                                 \
+       $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) $(ATK_LIBS) $(GTK_LIBS)

diff --git a/tests/clients/key-listener-test.c b/tests/cspi/key-listener-test.c
similarity index 100%
rename from tests/clients/key-listener-test.c
rename to tests/cspi/key-listener-test.c

diff --git a/tests/clients/keysynth-test.c b/tests/cspi/keysynth-test.c
similarity index 100%
rename from tests/clients/keysynth-test.c
rename to tests/cspi/keysynth-test.c

diff --git a/tests/clients/simple-at.c b/tests/cspi/simple-at.c
similarity index 100%
rename from tests/clients/simple-at.c
rename to tests/cspi/simple-at.c

diff --git a/tests/pyatspi/Makefile.am b/tests/pyatspi/Makefile.am
new file mode 100644 (file)
index 0000000..5c96eae
--- /dev/null
+++ b/tests/pyatspi/Makefile.am
@@ -0,0 +1,7 @@
+EXTRA_DIST = \
+       __init__.py             \
+       accessibleobject.py     \
+       component.py            \
+       testutil.py
+
+CLEANFILES = *.pyc

diff --git a/tests/clients/__init__.py b/tests/pyatspi/__init__.py
similarity index 100%
rename from tests/clients/__init__.py
rename to tests/pyatspi/__init__.py

diff --git a/tests/clients/accessibletest.py b/tests/pyatspi/accessibletest.py
similarity index 100%
rename from tests/clients/accessibletest.py
rename to tests/pyatspi/accessibletest.py

diff --git a/tests/clients/componenttest.py b/tests/pyatspi/componenttest.py
similarity index 100%
rename from tests/clients/componenttest.py
rename to tests/pyatspi/componenttest.py

diff --git a/tests/clients/coretest.py b/tests/pyatspi/coretest.py
similarity index 100%
rename from tests/clients/coretest.py
rename to tests/pyatspi/coretest.py

diff --git a/tests/clients/testutil.py b/tests/pyatspi/testutil.py
similarity index 100%
rename from tests/clients/testutil.py
rename to tests/pyatspi/testutil.py