diff options
| author | Noah Levitt <nlevitt@columbia.edu> | 2003-09-02 23:45:49 +0000 |
|---|---|---|
| committer | Noah Levitt <nlevitt@src.gnome.org> | 2003-09-02 23:45:49 +0000 |
| commit | 062aaab2f96ea78de52535b45ed77126bfc78197 (patch) | |
| tree | e17922f3c4c44a707b6c4840398f954381e3212a | |
| parent | ed4c53c2f048a327ce4f16bb90efa435f7bed27b (diff) | |
| download | pango-062aaab2f96ea78de52535b45ed77126bfc78197.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-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | tests/.cvsignore | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 22 | ||||
| -rw-r--r-- | tests/pangorc | 7 |
8 files changed, 63 insertions, 2 deletions
@@ -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) + Tue Aug 26 16:38:22 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch] diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 1cd9b610..2f56ec5f 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) + Tue Aug 26 16:38:22 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch] diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 1cd9b610..2f56ec5f 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) + Tue Aug 26 16:38:22 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch] diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 1cd9b610..2f56ec5f 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) + Tue Aug 26 16:38:22 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch] diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 1cd9b610..2f56ec5f 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) + Tue Aug 26 16:38:22 2003 Owen Taylor <otaylor@redhat.com> * modules/indic/Makefile.am (xft_sources): Add mprefixups.[ch] diff --git a/tests/.cvsignore b/tests/.cvsignore index d93b924e..443683c7 100644 --- a/tests/.cvsignore +++ b/tests/.cvsignore @@ -9,3 +9,4 @@ cxx-test testcolor Makefile.in Makefile +pango.modules diff --git a/tests/Makefile.am b/tests/Makefile.am index 17b314e8..8460ded6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -39,6 +39,10 @@ INCLUDES = \ TESTS=runtests.sh +TESTS_ENVIRONMENT = \ + srcdir=$(srcdir) \ + PANGO_RC_FILE=./pangorc + noinst_PROGRAMS = gen-all-unicode dump-boundaries check_PROGRAMS = testboundaries testcolor $(CXX_TEST) @@ -66,6 +70,22 @@ else CXX_TEST = endif +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 \ boundaries.utf8 \ @@ -74,5 +94,3 @@ EXTRA_DIST = \ all-unicode.txt: gen-all-unicode ./gen-all-unicode > all-unicode.txt -all-local: all-unicode.txt - 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 + |