Separate make test as unit and e2e

.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

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