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 903091aefa4bf11bb7fe179147073df4a61e7314..45c47991ec918536b91f22a0453112c1593a26bb 100644 (file)
--- 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 e3299b00e77d373892e8bc0e26be9b39810dde70..6a7b9800a97115e8d6434b1716a7ca43362cc9f7 100644 (file)
--- 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;
        }