From 9585febb58d43d81748774a13720ec5152d2bea7 Mon Sep 17 00:00:00 2001 From: Tzu-ping Chung Date: Wed, 22 Oct 2014 13:06:26 +0800 Subject: [PATCH] Make tests work on Windows --- Makefile.win | 5 +++++ test/runner.py | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile.win b/Makefile.win index cda24b9..ce5ffa2 100644 --- a/Makefile.win +++ b/Makefile.win @@ -34,3 +34,8 @@ clean: .c.obj: $(CC) $(CFLAGS) /c $< /Fo$@ + +# Testing + +test: hoedown.exe + python test\runner.py diff --git a/test/runner.py b/test/runner.py index 4102fad..7cbb27d 100755 --- a/test/runner.py +++ b/test/runner.py @@ -49,19 +49,18 @@ def _test_func(test_case): HOEDOWN + flags + [os.path.join(TEST_ROOT, test_case['input'])], stdout=subprocess.PIPE, ) - hoedown_proc.wait() + stdoutdata = hoedown_proc.communicate()[0] + got_tidy_proc = subprocess.Popen( - TIDY, stdin=hoedown_proc.stdout, stdout=subprocess.PIPE, + TIDY, stdin=subprocess.PIPE, stdout=subprocess.PIPE, ) - got_tidy_proc.wait() - got = got_tidy_proc.stdout.read().strip() + got = got_tidy_proc.communicate(input=stdoutdata)[0].strip() expected_tidy_proc = subprocess.Popen( TIDY + [os.path.join(TEST_ROOT, test_case['output'])], stdout=subprocess.PIPE, ) - expected_tidy_proc.wait() - expected = expected_tidy_proc.stdout.read().strip() + expected = expected_tidy_proc.communicate()[0].strip() # Cleanup. hoedown_proc.stdout.close()