[glom] Tests: Use the locally-built glom.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Tests: Use the locally-built glom.
- Date: Thu, 22 Nov 2012 12:03:40 +0000 (UTC)
commit 477edde0940fe64af54b2e19f908466a6cad77bb
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Nov 22 12:25:44 2012 +0100
Tests: Use the locally-built glom.
* configure.ac:
* Makefile_tests.am:
* tests/tests_glom_date_in_locales.sh.in:
Generate tests/tests_glom_date_in_locales.sh from
tests/tests_glom_date_in_locales.sh.in, so it can
include the path to the locally-built glom
executable.
ChangeLog | 12 ++++++++++++
Makefile_tests.am | 2 +-
configure.ac | 3 +++
..._locales.sh => test_glom_date_in_locales.sh.in} | 2 +-
4 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d1f55f9..b78389e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2012-11-22 Murray Cumming <murrayc murrayc com>
+ Tests: Use the locally-built glom.
+
+ * configure.ac:
+ * Makefile_tests.am:
+ * tests/tests_glom_date_in_locales.sh.in:
+ Generate tests/tests_glom_date_in_locales.sh from
+ tests/tests_glom_date_in_locales.sh.in, so it can
+ include the path to the locally-built glom
+ executable.
+
+2012-11-22 Murray Cumming <murrayc murrayc com>
+
Tests: Use the locally-built python module.
* Makefile_tests.am: Set the PYTHONPATH in
diff --git a/Makefile_tests.am b/Makefile_tests.am
index ec3f8c6..571095c 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -100,7 +100,7 @@ dist_noinst_SCRIPTS = tests/test_dtd_file_validation.sh \
tests/test_glade_file_validation.sh \
tests/test_xslt_file_validation.sh \
tests/test_glade_toplevels_instantiation.sh \
- tests/test_glom_date_in_locales.sh \
+ tests/test_glom_date_in_locales.sh.in \
tests/test_selfhosting_new_from_example_in_locales.sh \
tests/test_document_load_and_save_all.sh
diff --git a/configure.ac b/configure.ac
index 6224bff..1ce6cd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,4 +334,7 @@ AC_CONFIG_FILES([Makefile
docs/pyglom_reference/conf.py
docs/pyglom_reference/index.rst
win32/glom.iss])
+
+AC_CONFIG_FILES([tests/test_glom_date_in_locales.sh], [chmod u+x tests/test_glom_date_in_locales.sh])
+
AC_OUTPUT
diff --git a/tests/test_glom_date_in_locales.sh b/tests/test_glom_date_in_locales.sh.in
old mode 100755
new mode 100644
similarity index 95%
rename from tests/test_glom_date_in_locales.sh
rename to tests/test_glom_date_in_locales.sh.in
index f1d88f3..5d4cd0d
--- a/tests/test_glom_date_in_locales.sh
+++ b/tests/test_glom_date_in_locales.sh.in
@@ -23,5 +23,5 @@ do
export LANG="$x"
export LANGUAGE="$x"
export LC_TIME="$x"
- ${buildir}glom --debug-date-check || exit 1
+ @abs_top_builddir@/glom/glom --debug-date-check || exit 1
done
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]