fix build system to pass distcheck, based on patch by Nicolas Trangez,

2007-08-21  Juerg Billeter  <j@bitron.ch>

	* gee/Makefile.am, vala/Makefile.am, ccode/Makefile.am,
	  gobject/Makefile.am, compiler/Makefile.am, tests/Makefile.am,
	  tests/testrunner.sh: fix build system to pass distcheck,
	  based on patch by Nicolas Trangez, fixes bug 466283
	* Rename tests/*.out to tests/*.exp
	* tests/test-022.vala, tests/test-022.exp: reduce to regression test

svn path=/trunk/; revision=495

diff --git a/ChangeLog b/ChangeLog
index 4c7885eea10b236ad59a965320511c8bf23da26d..192a6f9f179f3dde40edad9ab0cb9fee6c4f5983 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-21  Jürg Billeter  <j@bitron.ch>
+
+       * gee/Makefile.am, vala/Makefile.am, ccode/Makefile.am,
+         gobject/Makefile.am, compiler/Makefile.am, tests/Makefile.am,
+         tests/testrunner.sh: fix build system to pass distcheck,
+         based on patch by Nicolas Trangez, fixes bug 466283
+       * Rename tests/*.out to tests/*.exp
+       * tests/test-022.vala, tests/test-022.exp: reduce to regression test
+
 2007-08-21  Jürg Billeter  <j@bitron.ch>
 
        * vala/valacodecontext.vala, vala/valasourcefile.vala,

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index 39dae094d9374d0d7c567900503aa0172a6fac00..7820288dfbc5a9bde4f30e9448acf4f6775e8a9e 100644 (file)
--- a/ccode/Makefile.am
+++ b/ccode/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 INCLUDES = \
+       -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)
 

diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index 750d0ee43b9bf5efeca1e4acd4738cbcce64a22d..df06189bc5fd7a2ffc69096e7a864d62832f4089 100644 (file)
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 INCLUDES = \
+       -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)
 

diff --git a/gee/Makefile.am b/gee/Makefile.am
index 9570518aabe566d7962630759bf23c1f84f9514b..c798d69c0c6be99a4a78e192da18b73245eac0ab 100644 (file)
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 INCLUDES = \
+       -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)
 

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 02b6c8fcb31e55acefedbad6733874e283c8a0fe..8dfdc6b51ca2ea4dece254a5fffe5ee2023bde64 100644 (file)
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 INCLUDES = \
+       -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b7cdfdb5ced8fb2e7611ef8ca53421ee0001fac..036bddce5ca6d25d03d98b539c310b54f9436ced 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -107,41 +107,41 @@ EXTRA_DIST = \
        test-033.vala \
        test-034.vala \
        test-035.vala \
-       test-001.out \
-       test-002.out \
-       test-003.out \
-       test-004.out \
-       test-005.out \
-       test-006.out \
-       test-007.out \
-       test-008.out \
-       test-009.out \
-       test-010.out \
-       test-011.out \
-       test-012.out \
-       test-013.out \
-       test-014.out \
-       test-015.out \
-       test-016.out \
-       test-017.out \
-       test-018.out \
-       test-019.out \
-       test-020.out \
-       test-021.out \
-       test-022.out \
-       test-023.out \
-       test-024.out \
-       test-025.out \
-       test-026.out \
-       test-027.out \
-       test-028.out \
-       test-029.out \
-       test-030.out \
-       test-031.out \
-       test-032.out \
-       test-033.out \
-       test-034.out \
-       test-035.out \
+       test-001.exp \
+       test-002.exp \
+       test-003.exp \
+       test-004.exp \
+       test-005.exp \
+       test-006.exp \
+       test-007.exp \
+       test-008.exp \
+       test-009.exp \
+       test-010.exp \
+       test-011.exp \
+       test-012.exp \
+       test-013.exp \
+       test-014.exp \
+       test-015.exp \
+       test-016.exp \
+       test-017.exp \
+       test-018.exp \
+       test-019.exp \
+       test-020.exp \
+       test-021.exp \
+       test-022.exp \
+       test-023.exp \
+       test-024.exp \
+       test-025.exp \
+       test-026.exp \
+       test-027.exp \
+       test-028.exp \
+       test-029.exp \
+       test-030.exp \
+       test-031.exp \
+       test-032.exp \
+       test-033.exp \
+       test-034.exp \
+       test-035.exp \
        \
        testenchant.stamp \
        testenchant.vala \

diff --git a/tests/test-001.out b/tests/test-001.exp
similarity index 100%
rename from tests/test-001.out
rename to tests/test-001.exp

diff --git a/tests/test-002.out b/tests/test-002.exp
similarity index 100%
rename from tests/test-002.out
rename to tests/test-002.exp

diff --git a/tests/test-003.out b/tests/test-003.exp
similarity index 100%
rename from tests/test-003.out
rename to tests/test-003.exp

diff --git a/tests/test-004.out b/tests/test-004.exp
similarity index 100%
rename from tests/test-004.out
rename to tests/test-004.exp

diff --git a/tests/test-005.out b/tests/test-005.exp
similarity index 100%
rename from tests/test-005.out
rename to tests/test-005.exp

diff --git a/tests/test-006.out b/tests/test-006.exp
similarity index 100%
rename from tests/test-006.out
rename to tests/test-006.exp

diff --git a/tests/test-007.out b/tests/test-007.exp
similarity index 100%
rename from tests/test-007.out
rename to tests/test-007.exp

diff --git a/tests/test-008.out b/tests/test-008.exp
similarity index 100%
rename from tests/test-008.out
rename to tests/test-008.exp

diff --git a/tests/test-009.out b/tests/test-009.exp
similarity index 100%
rename from tests/test-009.out
rename to tests/test-009.exp

diff --git a/tests/test-010.out b/tests/test-010.exp
similarity index 100%
rename from tests/test-010.out
rename to tests/test-010.exp

diff --git a/tests/test-011.out b/tests/test-011.exp
similarity index 100%
rename from tests/test-011.out
rename to tests/test-011.exp

diff --git a/tests/test-012.out b/tests/test-012.exp
similarity index 100%
rename from tests/test-012.out
rename to tests/test-012.exp

diff --git a/tests/test-013.out b/tests/test-013.exp
similarity index 100%
rename from tests/test-013.out
rename to tests/test-013.exp

diff --git a/tests/test-014.out b/tests/test-014.exp
similarity index 100%
rename from tests/test-014.out
rename to tests/test-014.exp

diff --git a/tests/test-015.out b/tests/test-015.exp
similarity index 100%
rename from tests/test-015.out
rename to tests/test-015.exp

diff --git a/tests/test-016.out b/tests/test-016.exp
similarity index 100%
rename from tests/test-016.out
rename to tests/test-016.exp

diff --git a/tests/test-017.out b/tests/test-017.exp
similarity index 100%
rename from tests/test-017.out
rename to tests/test-017.exp

diff --git a/tests/test-018.out b/tests/test-018.exp
similarity index 100%
rename from tests/test-018.out
rename to tests/test-018.exp

diff --git a/tests/test-019.out b/tests/test-019.exp
similarity index 100%
rename from tests/test-019.out
rename to tests/test-019.exp

diff --git a/tests/test-020.out b/tests/test-020.exp
similarity index 100%
rename from tests/test-020.out
rename to tests/test-020.exp

diff --git a/tests/test-021.out b/tests/test-021.exp
similarity index 100%
rename from tests/test-021.out
rename to tests/test-021.exp

diff --git a/tests/test-022.out b/tests/test-022.exp
similarity index 62%
rename from tests/test-022.out
rename to tests/test-022.exp
index faa113f22cc470aadb74b20b0b48825c26ffb407..a67af995611c6926d9a9f3ede4e6d126b4800596 100644 (file)
--- a/tests/test-022.out
+++ b/tests/test-022.exp
@@ -1,3 +1,3 @@
 One dimensional array creation and assignment: 1 2 3 4 5 6 7 8 9 10 11
 String array creation and assignment: 1 2 3 4 5 6 7 8 9 10 11
-Object array creation and assignment: 1 2 3 4 5 6 7 8 9 10 11 c b a b a c a b c
+Object array creation and assignment: 1 2 3 4 5 6 7 8 9 10 11

diff --git a/tests/test-022.vala b/tests/test-022.vala
index 9b2f4f8c5b71209c5269cc68e0a34146fce8e52a..59b2cc7679c9094ca86d9a7c37be5726f0afd17d 100644 (file)
--- a/tests/test-022.vala
+++ b/tests/test-022.vala
@@ -4,10 +4,6 @@ class Maman.Foo {
        public Foo (construct string bar) {
        }
 
-       public ~Foo () {
-               stdout.printf (" %s", _bar);
-       }
-
        public string bar { get; set construct; }
 
        static void test_integer_array () {

diff --git a/tests/test-023.out b/tests/test-023.exp
similarity index 100%
rename from tests/test-023.out
rename to tests/test-023.exp

diff --git a/tests/test-024.out b/tests/test-024.exp
similarity index 100%
rename from tests/test-024.out
rename to tests/test-024.exp

diff --git a/tests/test-025.out b/tests/test-025.exp
similarity index 100%
rename from tests/test-025.out
rename to tests/test-025.exp

diff --git a/tests/test-026.out b/tests/test-026.exp
similarity index 100%
rename from tests/test-026.out
rename to tests/test-026.exp

diff --git a/tests/test-027.out b/tests/test-027.exp
similarity index 100%
rename from tests/test-027.out
rename to tests/test-027.exp

diff --git a/tests/test-028.out b/tests/test-028.exp
similarity index 100%
rename from tests/test-028.out
rename to tests/test-028.exp

diff --git a/tests/test-029.out b/tests/test-029.exp
similarity index 100%
rename from tests/test-029.out
rename to tests/test-029.exp

diff --git a/tests/test-030.out b/tests/test-030.exp
similarity index 100%
rename from tests/test-030.out
rename to tests/test-030.exp

diff --git a/tests/test-031.out b/tests/test-031.exp
similarity index 100%
rename from tests/test-031.out
rename to tests/test-031.exp

diff --git a/tests/test-032.out b/tests/test-032.exp
similarity index 100%
rename from tests/test-032.out
rename to tests/test-032.exp

diff --git a/tests/test-033.out b/tests/test-033.exp
similarity index 100%
rename from tests/test-033.out
rename to tests/test-033.exp

diff --git a/tests/test-034.out b/tests/test-034.exp
similarity index 100%
rename from tests/test-034.out
rename to tests/test-034.exp

diff --git a/tests/test-035.out b/tests/test-035.exp
similarity index 100%
rename from tests/test-035.out
rename to tests/test-035.exp

diff --git a/tests/testrunner.sh b/tests/testrunner.sh
index c147886f9a357aa4fa3bb63c51dff4808b0a6e2f..edccabc2c3398067495d146c16f8ad53fdbd66bc 100755 (executable)
--- a/tests/testrunner.sh
+++ b/tests/testrunner.sh
@@ -20,35 +20,38 @@
 # Author:
 #      Jürg Billeter <j@bitron.ch>
 
-builddir=$(dirname $0)
+builddir=$PWD
 topbuilddir=$builddir/..
-vapidir=$topbuilddir/vapi
+srcdir=`dirname $0`
+topsrcdir=$srcdir/..
+vapidir=$topsrcdir/vapi
 
 export G_DEBUG=fatal_warnings
 
 VALAC=$topbuilddir/compiler/valac
 CC="gcc -std=c99"
-CFLAGS="-O0 -g3 -I.."
+CFLAGS="-O0 -g3 -I$topsrcdir"
 LDLIBS="-lm ../gee/.libs/libgee.a"
 
 CODE=0
 
 for testcasesource in "$@"
 do
-       testcase=${testcasesource/.vala/}
-       if ! $VALAC --vapidir "$vapidir" --pkg gee-1.0 $testcase.vala > $testcase.err 2>&1
+       testsrc=${testcasesource/.vala/}
+       testbuild=`basename "$testsrc"`
+       if ! $VALAC --vapidir "$vapidir" --pkg gee-1.0 $testsrc.vala > $testbuild.err 2>&1
        then
                CODE=1
                continue
        fi
-       if ! $CC $CFLAGS $(pkg-config --cflags --libs gobject-2.0) -o $testcase $testcase.c $LDLIBS > $testcase.err 2>&1
+       if ! $CC $CFLAGS $(pkg-config --cflags --libs gobject-2.0) -o $testbuild $testbuild.c $LDLIBS > $testbuild.err 2>&1
        then
                CODE=1
                continue
        fi
-       if ./$testcase | tee $testcase.err | cmp -s $testcase.out 
+       if ./$testbuild | tee $testbuild.err | cmp -s $testsrc.exp
        then
-               rm $testcase.err
+               rm $testbuild.c $testbuild.h $testbuild $testbuild.err
        else
                CODE=1
        fi

diff --git a/vala/Makefile.am b/vala/Makefile.am
index 211acec589f43f2e838d44ba597068d844b713f7..a3f0bff460d7e759f522eb6d0fa918b7cbb20bf2 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -1,6 +1,7 @@
 NULL =
 
 INCLUDES = \
+       -I$(top_srcdir) \
        $(GLIB_CFLAGS) \
        $(NULL)