diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2010-12-23 22:13:36 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2010-12-23 22:13:36 -0500 |
| commit | d209240b15f98233770efd4b184fe429ba77171a (patch) | |
| tree | c13f34c2f124d6384426992056a07582acf2a80d /gruel | |
| parent | 79c514b542d25e709903b41cfdc1673aae35ac1d (diff) | |
| parent | 7222b938cbfe0afd0886e4ce5e032cb756724903 (diff) | |
Merge branch 'master' into next
* master:
clean now gets rid of unittest results. Passes distcheck.
Modifying the unittest output. XML files are no longer written outside of the build tree.
A new patch for fixing the alsa restart issue. Submitted by Volker Schroer.
Reverting last change in alsa.
PFB resampler: fix it this way to avoid the signed/unsigned warning.
PFB resampler: fixes bug where filter could be looking past the number of inputs.
Adding a "change in progress" check to alsa sink.
Added a check in alsa sink if error has occurred due to blocking; if so, it will just drop samples and not get backed up. Patch taken from Marcus Leech 10/29/2010.
Conflicts:
Makefile.common
gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.cc
Diffstat (limited to 'gruel')
| -rw-r--r-- | gruel/src/lib/test_gruel.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gruel/src/lib/test_gruel.cc b/gruel/src/lib/test_gruel.cc index f4b9fc4e2d..2c9528b0ab 100644 --- a/gruel/src/lib/test_gruel.cc +++ b/gruel/src/lib/test_gruel.cc @@ -65,14 +65,13 @@ main(int argc, char **argv) */ static void -ensure_unittest_path (const char *grpath, const char *path) +ensure_unittest_path (const char *path) { struct stat statbuf; if (stat (path, &statbuf) == 0 && S_ISDIR (statbuf.st_mode)) return; // blindly try to make it // FIXME make this robust. C++ SUCKS! - gr_mkdir (grpath, 0750); gr_mkdir (path, 0750); } @@ -80,11 +79,9 @@ static void get_unittest_path (const char *filename, char *fullpath, size_t pathsize) { char path[200]; - char grpath[200]; - snprintf (grpath, sizeof(grpath), "%s/.gnuradio", getenv ("HOME")); - snprintf (path, sizeof(path), "%s/unittests", grpath); + snprintf (path, sizeof(path), "./.unittests"); snprintf (fullpath, pathsize, "%s/%s", path, filename); - ensure_unittest_path(grpath, path); + ensure_unittest_path(path); } |