From ceb1c5ec279523a2c8206f5650c30f56ac601f83 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Thu, 27 Aug 2015 23:05:08 +0100
Subject: [PATCH] Move test which requires modules to be installed to a
 separate target

---
 .appveyor.yml | 1 +
 .travis.yml   | 4 ++--
 Makefile.in   | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2b343926..d83b8b57 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -40,3 +40,4 @@ build_script:
     - c:\cygwin-root\bin\sh -lc "znc --version"
 test_script:
     - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; make VERBOSE=1 test < /dev/null"
+    - c:\cygwin-root\bin\sh -lc "cd $APPVEYOR_BUILD_FOLDER/build; make VERBOSE=1 test2 < /dev/null"
diff --git a/.travis.yml b/.travis.yml
index 995d88a1..cd359228 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,9 +81,9 @@ script:
     - ../configure --enable-perl --enable-python --enable-tcl --enable-cyrus --enable-charset $CFGFLAGS CXXFLAGS="$CXXFLAGS $MYCXXFLAGS" LDFLAGS="$LDFLAGS $MYLDFLAGS"
     - cat config.log
     - make V=1
-    - sudo make install
-      # test after install, because make test currently relies on modules to be installed
     - make V=1 test
+    - sudo make install
+    - make test2
     - cd ..
 after_success:
     - test -r .travis_after_all.py && python .travis_after_all.py || echo No .travis_after_all.py found
diff --git a/Makefile.in b/Makefile.in
index 395adc0e..2b8b0ccc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -222,10 +222,13 @@ uninstall:
 
 test: unittest
 	$(Q)./unittest
+
+test2:
 	# The following is only for coverage to see that we also have modules, which (theoretically) should be tested too.
 	# It exploits the fact that ZNC opens every module on startup to check whether it was installed properly or not.
 	# This should be replaced by a better integration test at some point.
 	# Also it uses files at <prefix>/lib/znc, which is less than ideal, especially from build scripts of distros.
+	# That's why it's a separate make target.
 	$(Q)./znc --makeconf --datadir $(shell pwd)/empty-dir-for-test < /dev/null || true
 
 -include $(wildcard .depend/*.dep)