[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8316 - in gnuradio/trunk: config gnuradio-core/src/py
From: |
eb |
Subject: |
[Commit-gnuradio] r8316 - in gnuradio/trunk: config gnuradio-core/src/python/gnuradio/gr |
Date: |
Wed, 7 May 2008 21:37:29 -0600 (MDT) |
Author: eb
Date: 2008-05-07 21:37:28 -0600 (Wed, 07 May 2008)
New Revision: 8316
Modified:
gnuradio/trunk/config/sdl.m4
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
Log:
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).
Modified: gnuradio/trunk/config/sdl.m4
===================================================================
--- gnuradio/trunk/config/sdl.m4 2008-05-07 21:59:09 UTC (rev 8315)
+++ gnuradio/trunk/config/sdl.m4 2008-05-08 03:37:28 UTC (rev 8316)
@@ -34,8 +34,8 @@
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=""
Modified: gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
===================================================================
--- gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
2008-05-07 21:59:09 UTC (rev 8315)
+++ gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
2008-05-08 03:37:28 UTC (rev 8316)
@@ -57,8 +57,9 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8316 - in gnuradio/trunk: config gnuradio-core/src/python/gnuradio/gr,
eb <=