summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Levitt <nlevitt@columbia.edu>2003-09-02 23:31:35 +0000
committerNoah Levitt <nlevitt@src.gnome.org>2003-09-02 23:31:35 +0000
commit357270dc307e32bd1285c2c66207d8a431f5688d (patch)
tree916f97c4502903567152ab7203cb09e87bc67f11
parent2701162a2cd223cb25b1b1d52974fff5763a2d02 (diff)
downloadpango-357270dc307e32bd1285c2c66207d8a431f5688d.tar.gz
Fix tests so that can be run before "make install" has been. (#119831)
2003-09-02 Noah Levitt <nlevitt@columbia.edu> * tests/.cvsignore: * tests/Makefile.am: * tests/pangorc: Fix tests so that can be run before "make install" has been. (#119831)
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-1-107
-rw-r--r--ChangeLog.pre-1-47
-rw-r--r--ChangeLog.pre-1-67
-rw-r--r--ChangeLog.pre-1-87
-rw-r--r--tests/.cvsignore1
-rw-r--r--tests/Makefile.am21
-rw-r--r--tests/pangorc7
8 files changed, 62 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 76bc52c5..c6c6f6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-02 Noah Levitt <nlevitt@columbia.edu>
+
+ * tests/.cvsignore:
+ * tests/Makefile.am:
+ * tests/pangorc: Fix tests so that can be run before "make install"
+ has been. (#119831)
+
Mon Aug 25 10:17:21 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 76bc52c5..c6c6f6c3 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+2003-09-02 Noah Levitt <nlevitt@columbia.edu>
+
+ * tests/.cvsignore:
+ * tests/Makefile.am:
+ * tests/pangorc: Fix tests so that can be run before "make install"
+ has been. (#119831)
+
Mon Aug 25 10:17:21 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 76bc52c5..c6c6f6c3 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+2003-09-02 Noah Levitt <nlevitt@columbia.edu>
+
+ * tests/.cvsignore:
+ * tests/Makefile.am:
+ * tests/pangorc: Fix tests so that can be run before "make install"
+ has been. (#119831)
+
Mon Aug 25 10:17:21 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 76bc52c5..c6c6f6c3 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+2003-09-02 Noah Levitt <nlevitt@columbia.edu>
+
+ * tests/.cvsignore:
+ * tests/Makefile.am:
+ * tests/pangorc: Fix tests so that can be run before "make install"
+ has been. (#119831)
+
Mon Aug 25 10:17:21 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 76bc52c5..c6c6f6c3 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+2003-09-02 Noah Levitt <nlevitt@columbia.edu>
+
+ * tests/.cvsignore:
+ * tests/Makefile.am:
+ * tests/pangorc: Fix tests so that can be run before "make install"
+ has been. (#119831)
+
Mon Aug 25 10:17:21 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
diff --git a/tests/.cvsignore b/tests/.cvsignore
index d6cd9e30..0055b0b3 100644
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -11,3 +11,4 @@ cxx-test
testcolor
Makefile.in
Makefile
+pango.modules
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ef1ea433..bb3e5046 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,6 +25,10 @@ endif
TESTS=runtests.sh
+TESTS_ENVIRONMENT = \
+ srcdir=$(srcdir) \
+ PANGO_RC_FILE=./pangorc
+
noinst_PROGRAMS = gen-all-unicode dump-boundaries
check_PROGRAMS = testboundaries testcolor testscript
@@ -54,6 +58,21 @@ check_PROGRAMS += cxx-test
endif
cxx_test_SOURCES = cxx-test.C
+if CROSS_COMPILING
+all-local: all-unicode.txt
+else
+all-local: all-unicode.txt pango.modules
+endif
+
+pango.modules:
+ if find ../modules -name '*.so' | grep 'so' > /dev/null ; then \
+ echo "Writing a pango.modules file to use when running tests before installing Pango."; \
+ (cd ../modules && \
+ ../pango/pango-querymodules `find . -name '*.la' | grep -v \.libs` > ../tests/pango.modules ) ;\
+ else \
+ echo "No dynamic modules found; will use only static modules for uninstalled test programs."; \
+ touch pango.modules; \
+ fi
EXTRA_DIST = \
all-unicode.txt \
@@ -63,6 +82,4 @@ EXTRA_DIST = \
all-unicode.txt: gen-all-unicode
./gen-all-unicode > all-unicode.txt
-all-local: all-unicode.txt
-
DISTCLEANFILES = all-unicode.txt runtests.log
diff --git a/tests/pangorc b/tests/pangorc
new file mode 100644
index 00000000..2004c977
--- /dev/null
+++ b/tests/pangorc
@@ -0,0 +1,7 @@
+#
+# pangorc file for uninstalled operation.
+#
+
+[Pango]
+ModuleFiles = ./pango.modules
+