fix tests

shadowsocks · Feb 1, 2015 · c7744f1 · c7744f1
1 parent 35e6300
commit c7744f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.jenkins.sh b/.jenkins.sh
@@ -27,6 +27,7 @@ function run_test {
 rm src/*.gc*
 run_test ./autogen.sh
 run_test ./configure --enable-debug
+make clean
 run_test make
 run_test tests/test.py -a '-c chnroute.txt -l iplist.txt' -t tests/google.com
 run_test tests/test.py -a '-c chnroute.txt -l iplist.txt' -t tests/facebook.com

diff --git a/src/chinadns.c b/src/chinadns.c
@@ -250,7 +250,6 @@ static int setnonblock(int sock) {
 static int parse_args(int argc, char **argv) {
  int ch;
  dns_servers = strdup(default_dns_servers);
- ip_list_file = NULL;
  listen_addr = strdup(default_listen_addr);
  listen_port = strdup(default_listen_port);
  while ((ch = getopt(argc, argv, "hb:p:s:l:c:y:dmv")) != -1) {

diff --git a/tests/test.py b/tests/test.py
@@ -9,14 +9,15 @@
 from subprocess import Popen
 
 parser = argparse.ArgumentParser(description='test ChinaDNS')
-parser.add_argument('-a', '--arguments', type=list, default=[])
+parser.add_argument('-a', '--arguments', type=str, default=[])
 parser.add_argument('-t', '--test-command', type=str, default=None)
 
 config = parser.parse_args()
 
 arguments = config.arguments
-chinadns = ['src/chinadns', '-p', '15353', '-v'] + arguments
+chinadns = ['src/chinadns', '-p', '15353', '-v'] + arguments.split()
 
+print chinadns
 p1 = Popen(chinadns, shell=False, bufsize=0, close_fds=True)
 try: