From 97501805b86fa1b38ef8d363255e913909cd42cf Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Wed, 17 Jul 2013 15:17:32 -0400
Subject: Add test script.

---
 .bzrignore                                             |  2 +-
 .../tests/Makefile.am                                  | 18 +++++++++---------
 debian/patches/disable-experimental-non-null.patch     |  2 +-
 po/indicator-keyboard.pot                              |  8 ++++----
 tests/Makefile.am                                      | 18 +++++++++---------
 tests/indicator-keyboard-test                          |  3 +++
 6 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100755 tests/indicator-keyboard-test

diff --git a/.bzrignore b/.bzrignore
index 66db2b25..85aabfae 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -30,6 +30,6 @@ po/POTFILES
 po/stamp-it
 tests/config.vala
 tests/indicator-keyboard-service
-tests/indicator-keyboard-test
 tests/indicator-keyboard-test.trs
+tests/indicator-keyboard-tests
 tests/services/indicator-keyboard.service
diff --git a/.pc/disable-experimental-non-null.patch/tests/Makefile.am b/.pc/disable-experimental-non-null.patch/tests/Makefile.am
index b4e80c02..e930b069 100644
--- a/.pc/disable-experimental-non-null.patch/tests/Makefile.am
+++ b/.pc/disable-experimental-non-null.patch/tests/Makefile.am
@@ -1,6 +1,6 @@
 TESTS = indicator-keyboard-test
 
-check_PROGRAMS = indicator-keyboard-test
+check_PROGRAMS = indicator-keyboard-tests
 
 AM_CFLAGS = -w
 AM_LDFLAGS = -lm
@@ -8,11 +8,11 @@ AM_VALAFLAGS = --enable-experimental-non-null   \
                --metadatadir $(top_srcdir)/deps \
                --vapidir $(top_srcdir)/deps
 
-indicator_keyboard_test_SOURCES = main.vala   \
-                                  config.vala
-indicator_keyboard_test_VALAFLAGS = $(AM_VALAFLAGS) \
-                                    --pkg gio-2.0
-indicator_keyboard_test_CFLAGS = $(AM_CFLAGS)  \
-                                 $(GIO_CFLAGS)
-indicator_keyboard_test_LDFLAGS = $(AM_LDFLAGS) \
-                                  $(GIO_LIBS)
+indicator_keyboard_tests_SOURCES = main.vala   \
+                                   config.vala
+indicator_keyboard_tests_VALAFLAGS = $(AM_VALAFLAGS) \
+                                     --pkg gio-2.0
+indicator_keyboard_tests_CFLAGS = $(AM_CFLAGS)  \
+                                  $(GIO_CFLAGS)
+indicator_keyboard_tests_LDFLAGS = $(AM_LDFLAGS) \
+                                   $(GIO_LIBS)
diff --git a/debian/patches/disable-experimental-non-null.patch b/debian/patches/disable-experimental-non-null.patch
index 69698d37..2d2329c3 100644
--- a/debian/patches/disable-experimental-non-null.patch
+++ b/debian/patches/disable-experimental-non-null.patch
@@ -9,7 +9,7 @@
 +AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
                 --vapidir $(top_srcdir)/deps
  
- indicator_keyboard_test_SOURCES = main.vala   \
+ indicator_keyboard_tests_SOURCES = main.vala   \
 --- a/tests/main.vala
 +++ b/tests/main.vala
 @@ -146,7 +146,7 @@
diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot
index f7e98de5..a8ab3fca 100644
--- a/po/indicator-keyboard.pot
+++ b/po/indicator-keyboard.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-17 11:23-0400\n"
+"POT-Creation-Date: 2013-07-17 15:17-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/main.c:2244 ../lib/main.vala:517
+#: ../lib/main.c:2297 ../lib/main.vala:532
 msgid "Character Map"
 msgstr ""
 
-#: ../lib/main.c:2246 ../lib/main.vala:518
+#: ../lib/main.c:2299 ../lib/main.vala:533
 msgid "Keyboard Layout Chart"
 msgstr ""
 
-#: ../lib/main.c:2248 ../lib/main.vala:519
+#: ../lib/main.c:2301 ../lib/main.vala:534
 msgid "Text Entry Settings..."
 msgstr ""
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9161365e..2e0e0287 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,17 +1,17 @@
 TESTS = indicator-keyboard-test
 
-check_PROGRAMS = indicator-keyboard-test
+check_PROGRAMS = indicator-keyboard-tests
 
 AM_CFLAGS = -w
 AM_LDFLAGS = -lm
 AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
                --vapidir $(top_srcdir)/deps
 
-indicator_keyboard_test_SOURCES = main.vala   \
-                                  config.vala
-indicator_keyboard_test_VALAFLAGS = $(AM_VALAFLAGS) \
-                                    --pkg gio-2.0
-indicator_keyboard_test_CFLAGS = $(AM_CFLAGS)  \
-                                 $(GIO_CFLAGS)
-indicator_keyboard_test_LDFLAGS = $(AM_LDFLAGS) \
-                                  $(GIO_LIBS)
+indicator_keyboard_tests_SOURCES = main.vala   \
+                                   config.vala
+indicator_keyboard_tests_VALAFLAGS = $(AM_VALAFLAGS) \
+                                     --pkg gio-2.0
+indicator_keyboard_tests_CFLAGS = $(AM_CFLAGS)  \
+                                  $(GIO_CFLAGS)
+indicator_keyboard_tests_LDFLAGS = $(AM_LDFLAGS) \
+                                   $(GIO_LIBS)
diff --git a/tests/indicator-keyboard-test b/tests/indicator-keyboard-test
new file mode 100755
index 00000000..2f336e42
--- /dev/null
+++ b/tests/indicator-keyboard-test
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./indicator-keyboard-tests
-- 
cgit v1.2.3