[Libreoffice-commits] .: Makefile.am

[Jan Holesovsky]

 Makefile.am |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 843d85c277f4e310685c30301a1e77e4208b5a76
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Nov 2 13:28:53 2010 +0100

    Timeout 'smoketest' run if gets stuck - necessary for tinderboxes.

diff --git a/Makefile.am b/Makefile.am
index 884129e..195410b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -164,8 +164,15 @@ $(BUILDDIR)/install/program/ooenv: $(STAMP_DIR)/build
 	fi
 
 smoketest: $(BUILDDIR)/install/program/ooenv
-	( . $(OOBUILDDIR)/*.Set.sh ; export SAL_USE_VCLPLUGIN="svp" ; \
-	  cd $(OOBUILDDIR)/test && build && deliver && cd $(OOBUILDDIR)/smoketestoo_native && build )
+	# Run smoketest, but timeout in 15 minutes if it got stuck
+	( ( . $(OOBUILDDIR)/*.Set.sh ; export SAL_USE_VCLPLUGIN="svp" ; \
+	    cd $(OOBUILDDIR)/test && build.pl && deliver.pl && \
+	    cd $(OOBUILDDIR)/smoketestoo_native && build.pl ) & \
+	  ( COMMAND_PID=$! ; DELAY=$((15*60)) ; \
+	    while test "$$DELAY" -gt "0" && ps "$$COMMAND_PID" > /dev/null ; do \
+	        sleep 1 ; DELAY=$(($DELAY-1)) ; \
+	    done ; \
+	    ps "$$COMMAND_PID" > /dev/null && ( kill "$$COMMAND_PID" ; echo "Smoketest timed out, killed." ; exit 1 ) ) )
 
 id : $(OOBUILDDIR)/ID
 $(OOBUILDDIR)/ID : $(STAMP_DIR)/build