From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 May 2011 00:22:44 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ac8ff9c9f182b6202200480f8fc4689da659331;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2'
---

4ac8ff9c9f182b6202200480f8fc4689da659331
diff --cc src/test/test_util.c
index ee2d455b29,23cd059cf7..d338bbac9c
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@@ -1495,14 -1315,9 +1524,15 @@@ struct testcase_t util_tests[] = 
    UTIL_TEST(find_str_at_start_of_line, 0),
    UTIL_TEST(asprintf, 0),
    UTIL_TEST(listdir, 0),
+   UTIL_TEST(parent_dir, 0),
  #ifdef MS_WINDOWS
    UTIL_TEST(load_win_lib, 0),
 +#endif
 +  UTIL_TEST(exit_status, 0),
 +#ifndef MS_WINDOWS
 +  UTIL_TEST(fgets_eagain, TT_SKIP),
 +  UTIL_TEST(spawn_background_ok, 0),
 +  UTIL_TEST(spawn_background_fail, 0),
  #endif
    END_OF_TESTCASES
  };