[Libreoffice-commits] .: smoketestoo_native/makefile.mk

Jan Holesovsky kendy at kemper.freedesktop.org
Mon Nov 28 13:45:26 PST 2011


 smoketestoo_native/makefile.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c66b52b0b25f437a26069ffaf591a42ab6360180
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Nov 28 22:44:57 2011 +0100

    Don't run smoketest when cross-compiling.

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 24732ab..eceea55 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -50,8 +50,11 @@ DEF1NAME = $(SHL1TARGET)
 .INCLUDE: installationtest.mk
 
 .IF "$(depend)" == ""
+# disable smoketest when cross-compiling for now; we can use wine at some stage (?)
+.IF "$(CROSS_COMPILING)" != "YES"
 ALLTAR : cpptest
 .END
+.END
 
 cpptest : $(SHL1TARGETN)
 


More information about the Libreoffice-commits mailing list