Changeset 8316

Show
Ignore:
Timestamp:
05/07/08 21:37:28
Author:
eb
Message:

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).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/trunk/config/sdl.m4

    r6852 r8316  
    3535 
    3636  AC_REQUIRE([AC_CANONICAL_TARGET]) 
    37   PATH="$prefix/bin:$prefix/usr/bin:$PATH" 
    38   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) 
     37  TMP_PATH="$prefix/bin:$prefix/usr/bin:$PATH" 
     38  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$TMP_PATH]) 
    3939  min_sdl_version=ifelse([$1], ,0.11.0,$1) 
    4040  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) 

  • gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_wavefile.py

    r8163 r8316  
    5858        out_f = file(outfile, 'rb') 
    5959 
    60         in_data  = in_f.read(getsize(infile)) 
    61         out_data = out_f.read(getsize(outfile)) 
     60        in_data  = in_f.read() 
     61        out_data = out_f.read() 
     62        out_f.close() 
    6263        os.remove(outfile) 
    6364