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

2 files changed, 22 insertions, 24 deletions

diff --git a/gnuradio-core/src/lib/runtime/gr_unittests.h b/gnuradio-core/src/lib/runtime/gr_unittests.h
index 680e59ca4..70aa6f294 100644
--- a/gnuradio-core/src/lib/runtime/gr_unittests.h
+++ b/gnuradio-core/src/lib/runtime/gr_unittests.h
@@ -45,14 +45,13 @@
  */
 
 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);
 }
 
@@ -60,11 +59,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);
 }
 
diff --git a/gnuradio-core/src/python/gnuradio/gr_unittest.py b/gnuradio-core/src/python/gnuradio/gr_unittest.py
index 50d484a76..c2c4df2ba 100755
--- a/gnuradio-core/src/python/gnuradio/gr_unittest.py
+++ b/gnuradio-core/src/python/gnuradio/gr_unittest.py
@@ -38,7 +38,7 @@ class TestCase(unittest.TestCase):
 
            Note that decimal places (from zero) is usually not the same
            as significant digits (measured from the most signficant digit).
-        """
+       """
         if round(second.real-first.real, places) != 0:
             raise self.failureException, \
                   (msg or '%s != %s within %s places' % (`first`, `second`, `places` ))
@@ -112,30 +112,31 @@ def run(PUT, filename=None):
     Runs the unittest on a TestCase and produces an optional XML report
     PUT:      the program under test and should be a gr_unittest.TestCase
     filename: an optional filename to save the XML report of the tests
-              this will live in $HOME/.gnuradio/unittests/python
+              this will live in ./.unittests/python
     '''
 
     # Run this is given a file name
     if(filename is not None):
-        homepath = os.getenv("HOME")
-        basepath = homepath + "/.gnuradio"
-        path = homepath + "/.gnuradio/unittests/python"
+        basepath = "./.unittests"
+        path = basepath + "/python"
+
+        if not os.path.exists(basepath):
+            os.makedirs(basepath, 0750)
 
         xmlrunner = None
-        if os.path.exists(basepath):
-            # only proceed if $HOME/.gnuradio is writable
-            st = os.stat(basepath)[stat.ST_MODE]
+        # only proceed if .unittests is writable
+        st = os.stat(basepath)[stat.ST_MODE]
+        if(st & stat.S_IWUSR > 0):
+            # Test if path exists; if not, build it
+            if not os.path.exists(path):
+                os.makedirs(path, 0750)
+
+            # Just for safety: make sure we can write here, too
+            st = os.stat(path)[stat.ST_MODE]
             if(st & stat.S_IWUSR > 0):
-                # Test if path exists; if not, build it
-                if not os.path.exists(path):
-                    os.makedirs(path, 0750)
-
-                # Just for safety: make sure we can write here, too
-                st = os.stat(path)[stat.ST_MODE]
-                if(st & stat.S_IWUSR > 0):
-                    # Create an XML runner to filename
-                    fout = file(path+"/"+filename, "w")
-                    xmlrunner = gr_xmlrunner.XMLTestRunner(fout)
+                # Create an XML runner to filename
+                fout = file(path+"/"+filename, "w")
+                xmlrunner = gr_xmlrunner.XMLTestRunner(fout)
 
         txtrunner = TextTestRunner(verbosity=1)