[Commit-gnuradio] r8346 - in gnuradio/branches/releases/3.1: config gnuradio-core/src/python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2008-05-09 01:17:01 -0600 (Fri, 09 May 2008)
New Revision: 8346

Modified:
   gnuradio/branches/releases/3.1/config/sdl.m4
   
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
Log:
Applied changeset r8316 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/config/sdl.m4
===================================================================
--- gnuradio/branches/releases/3.1/config/sdl.m4        2008-05-09 07:12:45 UTC 
(rev 8345)
+++ gnuradio/branches/releases/3.1/config/sdl.m4        2008-05-09 07:17:01 UTC 
(rev 8346)
@@ -33,8 +33,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/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
  2008-05-09 07:12:45 UTC (rev 8345)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py
  2008-05-09 07:17:01 UTC (rev 8346)
@@ -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)