aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-25 14:32:04 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-25 14:32:04 -0400
commit45530ed729e315218f9b5d11b15bb8167ddfc77c (patch)
treeba916a2646ae40a0cbec1baff46f070db06cb8f2 /src
parent81c47932329456dfff9370fb372d4f721cd1a628 (diff)
parentf9155ff416851e1a5523df92457fbc31a11141a8 (diff)
downloadtor-45530ed729e315218f9b5d11b15bb8167ddfc77c.tar.gz
tor-45530ed729e315218f9b5d11b15bb8167ddfc77c.zip
Merge branch 'bug22109'
Diffstat (limited to 'src')
-rw-r--r--src/test/test_dir.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 2d48cfc3c4..b920655db5 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -6140,6 +6140,29 @@ test_dir_post_parsing(void *arg)
;
}
+static void
+test_dir_platform_str(void *arg)
+{
+ char platform[256];
+ (void)arg;
+ platform[0] = 0;
+ get_platform_str(platform, sizeof(platform));
+ tt_int_op((int)strlen(platform), OP_GT, 0);
+ tt_assert(!strcmpstart(platform, "Tor "));
+
+ tor_version_t ver;
+ // make sure this is a tor version, a real actual tor version.
+ tt_int_op(tor_version_parse_platform(platform, &ver, 1), OP_EQ, 1);
+
+ TT_BLATHER(("%d.%d.%d.%d", ver.major, ver.minor, ver.micro, ver.patchlevel));
+
+ // Handle an example version.
+ tt_int_op(tor_version_parse_platform(
+ "Tor 0.3.3.3 (foo) (git-xyzzy) on a potato", &ver, 1), OP_EQ, 1);
+ done:
+ ;
+}
+
#define DIR_LEGACY(name) \
{ #name, test_dir_ ## name , TT_FORK, NULL, NULL }
@@ -6205,6 +6228,7 @@ struct testcase_t dir_tests[] = {
DIR_ARG(find_dl_schedule, TT_FORK, "car"),
DIR(assumed_flags, 0),
DIR(networkstatus_compute_bw_weights_v10, 0),
+ DIR(platform_str, 0),
END_OF_TESTCASES
};