From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 11 May 2019 15:00:21 +0000 (+0200)
Subject: Clean up detection of CI environment
X-Git-Tag: v3.7.2~15
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=db2900578f718bbcdee914a464188eb46a333da9;p=thirdparty%2Fccache.git

Clean up detection of CI environment

“RUN_FROM_BUILD_FARM” was set by the old Samba build farm, so switch to
checking “TRAVIS” instead. Also, keep running in dev mode in Travis.
---

diff --git a/configure.ac b/configure.ac
index 903091aef..45c47991e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,7 @@ fi
 mkdir -p .deps src unittest
 
 dnl Enable developer mode if dev.mk.in exists.
-if test ! -f $srcdir/dev_mode_disabled && test "$RUN_FROM_BUILD_FARM" != yes; then
+if test ! -f $srcdir/dev_mode_disabled; then
     AC_MSG_NOTICE(developer mode enabled)
     AC_CONFIG_FILES([dev.mk])
     include_dev_mk='include dev.mk'
diff --git a/unittest/main.c b/unittest/main.c
index e3299b00e..6a7b9800a 100644
--- a/unittest/main.c
+++ b/unittest/main.c
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2018 Joel Rosdahl
+// Copyright (C) 2010-2019 Joel Rosdahl
 //
 // This program is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by the Free
@@ -74,7 +74,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (getenv("RUN_FROM_BUILD_FARM")) {
+	if (getenv("TRAVIS")) {
 		verbose = 1;
 	}