Create make file to automate testproxy e2e tests Move lp under testproxy

.gitignore

@@ -23,7 +23,7 @@
 /tests/check/pki/server.key
 /tests/check/pki/targets/*
 /extra/*.pyc
-/extra/lp/lp
+/tests/testproxy/lp/lp
 
 /nbproject/
 

tests/testproxy/GNUmakefile

@@ -0,0 +1,30 @@
+TESTPROXY:= ~/.cargo/bin/testproxy
+
+all: test
+
+buildsslproxy:
+	$(MAKE) -C ../../
+
+buildlp:
+	$(MAKE) -C lp
+
+test: buildsslproxy buildlp
+	sudo ./lp/lp -f ./lp/lp.conf -o Debug=no -o Daemon=yes -o User=nobody
+	sudo ../../src/sslproxy -f sslproxy.conf -o Debug=no -o Daemon=yes -o User=nobody
+	# TODO: Install cargo first, in travis config before_install, using one of the following command lines
+	#curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+	#curl https://sh.rustup.rs -sSf | sh
+	#cargo install testproxy
+	$(TESTPROXY) -f testharness.json
+	sudo pkill sslproxy
+	sudo pkill lp
+
+clean:
+	sudo pkill sslproxy
+	sudo pkill lp
+	$(MAKE) -C lp clean
+
+FORCE:
+
+.PHONY: all clean buildsslproxy buildlp test
+

tests/testproxy/lp/lp.conf

@@ -1,7 +1,6 @@
 # Sample configuration for lp v0.6.0
 #
 # Use the -f command line option to start lp with a config file.
-# See lp.conf(5) and lp(1) for documentation.
 
 # Drop privileges to user.
 # Equivalent to -u command line option.
@@ -11,7 +10,7 @@ User soner
 # Drop privileges to group.
 # Equivalent to -m command line option.
 # (default: primary group of user)
-Group soner
+#Group soner
 
 # chroot() to jaildir (impacts sni proxyspecs, see lp(1)).
 # Equivalent to -j command line option.

tests/testproxy/sslproxy.conf

@@ -1,7 +1,7 @@
 # TestProxy test configuration for sslproxy v0.7.0
 
 # Global options
-#User _sslproxy
+User soner
 #Group _sslproxy
 #Chroot /var/run/sslproxy
 PidFile /var/run/sslproxy.pid