From db3ca13185dac5802e56c18f6d181f886ff28abc Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 17 Aug 2014 06:35:00 -0400
Subject: travis configuration

---
 crawl-ref/source/Makefile        | 2 +-
 crawl-ref/source/util/fake_pty.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'crawl-ref')

diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index db39bd95cc..57201aaa47 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -1712,7 +1712,7 @@ test-%: $(GAME) util/fake_pty builddb
 	@echo "Finished: $*"
 
 util/fake_pty: util/fake_pty.c
-	$(QUIET_HOSTCC)$(if $(HOSTCC),$(HOSTCC),$(CC)) -Wall $< -o $@ -lutil
+	$(QUIET_HOSTCC)$(if $(HOSTCC),$(HOSTCC),$(CC)) $(if $(TRAVIS),-DTRAVIS,) -Wall $< -o $@ -lutil
 
 # Should be not needed, but the race condition in bug #6509 is hard to fix.
 builddb: $(GAME)
diff --git a/crawl-ref/source/util/fake_pty.c b/crawl-ref/source/util/fake_pty.c
index 5db9d78cd7..69ed62b450 100644
--- a/crawl-ref/source/util/fake_pty.c
+++ b/crawl-ref/source/util/fake_pty.c
@@ -30,7 +30,16 @@ static void slurp_output()
     while (poll(&pfd, 1, 60000) > 0) // 60 seconds with no output -> die die die!
     {
         if (read(tty, buf, sizeof(buf)) <= 0)
+#ifdef TRAVIS
+        {
+            puts(".");
+#endif
             break;
+#ifdef TRAVIS
+        }
+        else
+            puts("x");
+#endif
     }
 
     kill(crawl, SIGTERM); // shooting a zombie is ok, let's make sure it's dead
-- 
cgit v1.2.3-54-g00ecf