summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--tests/Makefile.am4
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e77fc85a..38c80d63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-27 Behdad Esfahbod <behdad@gnome.org>
+
+ Bug 451547 – FAIL: runtests.sh
+
+ * tests/Makefile.am: Don't run tests if cross-compiling.
+ (though cross-compiling tests work under scratchbox, so I'm not
+ quite sure how good this change is.)
+
2007-06-26 Richard Hult <richard@imendio.com>
* pango/pangoatsui.c: (_pango_atsui_font_set_atsu_font_id):
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d05667e3..f1b24a42 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,7 +31,11 @@ INCLUDES += -DHAVE_WIN32
endif
+if CROSS_COMPILING
+TESTS=
+else
TESTS=runtests.sh
+endif
TESTS_ENVIRONMENT = \
srcdir=$(srcdir) \