1.1 --- a/tests/harness.py	Sat Nov 17 20:03:57 2012 -0800
     1.2 +++ b/tests/harness.py	Sat Nov 17 20:09:02 2012 -0800
     1.3 @@ -17,15 +17,14 @@
     1.4        folders.append(name)
     1.5        continue
     1.6  
     1.7 -    path = os.path.join(root, folder)
     1.8      out = re.match("^([^\.]+)\.out$", name)
     1.9      err = re.match("^([^\.]+)\.err$", name)
    1.10      if out:
    1.11 -        name = out.group(1)
    1.12 -        tests.append(Test(path, name, 'out'))
    1.13 +        name = os.path.join(folder, out.group(1))
    1.14 +        tests.append(Test(root, name, 'out'))
    1.15      elif err:
    1.16 -        name = err.group(1)
    1.17 -        tests.append(Test(path, name, 'err'))
    1.18 +        name = os.path.join(folder, err.group(1))
    1.19 +        tests.append(Test(root, name, 'err'))
    1.20  
    1.21    for name in folders:
    1.22      path = os.path.join(folder, name)
    1.23 @@ -58,8 +57,7 @@
    1.24          L[0].kill()
    1.25          time.sleep(.1)
    1.26          timeout = True
    1.27 -      except OSError:
    1.28 -        # Expecting a "No such process" error
    1.29 +      except e:
    1.30          pass
    1.31  
    1.32    th.join()