diff options
| author | eb | 2008-05-08 03:37:28 +0000 |
|---|---|---|
| committer | eb | 2008-05-08 03:37:28 +0000 |
| commit | 642d5860b15175e4540f59afccb1ab20d8bc7d1f (patch) | |
| tree | 251ea7e486d9e95e705ad3e8bdb1d7dfe5b7927a | |
| parent | d5e5244a9ce8c5c3847c133c1107fba2af0e90c3 (diff) | |
| download | gnuradio-642d5860b15175e4540f59afccb1ab20d8bc7d1f.tar.gz gnuradio-642d5860b15175e4540f59afccb1ab20d8bc7d1f.tar.bz2 gnuradio-642d5860b15175e4540f59afccb1ab20d8bc7d1f.zip | |
Applied patches from Don Ward.
(1) Close out_f before removing it in
gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py (to prevent make check
failure).
(2) Don't permanently change PATH in config/sdl.m4 (to prevent real
problems in MinGW and potential problems for any code that runs after
sdl.m4 and depends on PATH).
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8316 221aa14e-8319-0410-a670-987f0aec2ac5
| -rw-r--r-- | config/sdl.m4 | 4 | ||||
| -rwxr-xr-x | gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/config/sdl.m4 b/config/sdl.m4 index d4246620e..20ad7df35 100644 --- a/config/sdl.m4 +++ b/config/sdl.m4 @@ -34,8 +34,8 @@ AC_ARG_ENABLE(sdltest, AC_HELP_STRING([--disable-sdltest], fi AC_REQUIRE([AC_CANONICAL_TARGET]) - PATH="$prefix/bin:$prefix/usr/bin:$PATH" - AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) + TMP_PATH="$prefix/bin:$prefix/usr/bin:$PATH" + AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$TMP_PATH]) min_sdl_version=ifelse([$1], ,0.11.0,$1) AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) no_sdl="" diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py b/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py index c6d376a81..3ba5dfbce 100755 --- a/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py +++ b/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py @@ -57,8 +57,9 @@ class qa_wavefile(gr_unittest.TestCase): in_f = file(infile, 'rb') out_f = file(outfile, 'rb') - in_data = in_f.read(getsize(infile)) - out_data = out_f.read(getsize(outfile)) + in_data = in_f.read() + out_data = out_f.read() + out_f.close() os.remove(outfile) self.assertEqual(in_data, out_data) |