[tor-commits] [tor/master] Fix the checkdir/perms test when umask==077

[nickm at torproject.org]

commit 88e36eaf0e508f3745bd8aa2aedb1324b273ebf0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 15 10:24:27 2015 -0500

    Fix the checkdir/perms test when umask==077
    
    Fixes 14215; bugfix on 0.2.6.2-alpha.  Reported by "cypherpunks".
---
 changes/bug14215         |    5 +++++
 src/test/test_checkdir.c |    5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/changes/bug14215 b/changes/bug14215
new file mode 100644
index 0000000..70bcdaa
--- /dev/null
+++ b/changes/bug14215
@@ -0,0 +1,5 @@
+  o Minor bugfixes (tests):
+    - Make the checkdir/perms test complete successfully even if the
+      global umask is not 022. Fixes bug 14215; bugfix on 0.2.6.2-alpha.
+
+
diff --git a/src/test/test_checkdir.c b/src/test/test_checkdir.c
index 882e3b3..ae85944 100644
--- a/src/test/test_checkdir.c
+++ b/src/test/test_checkdir.c
@@ -11,6 +11,7 @@
 #ifdef _WIN32
 #define mkdir(a,b) mkdir(a)
 #define tt_int_op_nowin(a,op,b) do { (void)(a); (void)(b); } while (0)
+#define umask(mask) ((void)0)
 #else
 #define tt_int_op_nowin(a,op,b) tt_int_op((a),op,(b))
 #endif
@@ -28,6 +29,8 @@ test_checkdir_perms(void *testdata)
   cpd_check_t  unix_verify_optsmask;
   struct stat st;
 
+  umask(022);
+
   /* setup data directory before tests. */
   tor_free(options->DataDirectory);
   options->DataDirectory = tor_strdup(get_fname(subdir));
@@ -134,7 +137,7 @@ test_checkdir_perms(void *testdata)
   { #name, test_checkdir_##name, (flags), NULL, NULL }
 
 struct testcase_t checkdir_tests[] = {
-  CHECKDIR(perms, 0),
+  CHECKDIR(perms, TT_FORK),
   END_OF_TESTCASES
 };