diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-31 16:21:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-31 16:21:54 -0400 |
| commit | dff73d26f3a6c9d7011ad98a6752129a37625a10 (patch) | |
| tree | 6fdf63be0e3331f098675bf694333672b699f7f1 /src/test | |
| parent | fc0842275de8f8ab43374df922907d97b4e60b58 (diff) | |
| parent | b86c562d76c7b0cce25a3a9f46d5d66e2eef30ff (diff) | |
| download | tor-dff73d26f3a6c9d7011ad98a6752129a37625a10.tar.gz tor-dff73d26f3a6c9d7011ad98a6752129a37625a10.zip | |
Merge remote-tracking branch 'public/bug5089'
Conflicts:
src/test/test_util.c
Merge the unit tests; I added some when I did this branch against
0.2.2, and then the test format changed and master added more tests.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_util.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 99c5544508..e05269252b 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2084,10 +2084,8 @@ test_util_parent_dir(void *ptr) T("/home/wombat", 0, "/home/wombat/knish/"); T("/home/wombat", 0, "/home/wombat/knish///"); T("./home/wombat", 0, "./home/wombat/knish/"); -#if 0 T("/", 0, "/home"); T("/", 0, "/home//"); -#endif T(".", 0, "./wombat"); T(".", 0, "./wombat/"); T(".", 0, "./wombat//"); @@ -2101,14 +2099,12 @@ test_util_parent_dir(void *ptr) T("wombat", 0, "wombat/.foo"); T("wombat", 0, "wombat/.foo/"); - T("", -1, ""); - T("", -1, "."); - T("", -1, ".."); - T("", -1, "../"); - T("", -1, "/"); - T("", -1, "////"); - T("", -1, "wombat"); - T("", -1, "wombat/"); + T("wombat", -1, ""); + T("w", -1, ""); + T("wombat", 0, "wombat/knish"); + + T("/", 0, "/"); + T("/", 0, "////"); done: tor_free(cp); |