From 255cd1cd88ef220c7c1674ae1e642885cd363af7 Mon Sep 17 00:00:00 2001
From: Soner Tari <sonertari@gmail.com>
Date: Wed, 23 Dec 2020 22:35:32 +0300
Subject: [PATCH] Separate make test as unit and e2e

---
 .travis.yml |  1 +
 GNUmakefile | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e68aa8a..837fd65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -184,3 +184,4 @@ matrix:
         - test -d /usr/local/opt/check/lib    || { rmdir /usr/local/opt/check; brew install check; }
         # Disable travis testproxy tests on osx
         #- curl -f -L https://static.rust-lang.org/rustup.sh -O && sh rustup.sh -y && source $HOME/.cargo/env && cargo install testproxy
+      script: make && make travisunittest && ./src/sslproxy -V
diff --git a/GNUmakefile b/GNUmakefile
index ad3ffd2..7dccdce 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -10,7 +10,13 @@ $(TARGET):
 	$(MAKE) -C $(SRCDIR)
 
 test: $(TARGET)
+	$(MAKE) unittest
+	$(MAKE) e2etest
+
+unittest: $(TARGET)
 	$(MAKE) -C $(CHECKTESTSDIR)
+
+e2etest: $(TARGET)
 	$(MAKE) -C $(TESTPROXYTESTSDIR)
 
 clean:
@@ -18,12 +24,14 @@ clean:
 	$(MAKE) -C $(CHECKTESTSDIR) clean
 
 travis: $(TARGET)
+	$(MAKE) travisunittest
+	$(MAKE) travise2etest
+
+travisunittest: $(TARGET)
 	$(MAKE) -C $(CHECKTESTSDIR) travis
-ifneq ($(shell uname),Darwin)
+
+travise2etest: $(TARGET)
 	$(MAKE) -C $(TESTPROXYTESTSDIR) travis
-else
-	$(warning Not running travis $(TESTPROXYTESTSDIR) on $(shell uname))
-endif
 
 install:
 	$(MAKE) -C $(SRCDIR) install