From c9f3e1eeb95160bd690fe37636e732421543bd13 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 21 Nov 2017 14:33:35 -0800 Subject: Fixes for Circle environment. The test suites run as root inside docker (?), so the files permission test needs to be skipped. Circle, like Travis, lacks support correct IPv6. I think this is because of basic deficiency in Amazon's EC2 product. Come on Amazon, it's 2017, you have to support IPv6! --- tests/files.c | 3 +++ tests/resolv.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/files.c b/tests/files.c index c7e6a1dd..6e9e5564 100644 --- a/tests/files.c +++ b/tests/files.c @@ -33,6 +33,9 @@ test_permissions(void) temp = nni_plat_temp_dir(); So(temp != NULL); file = nni_plat_join_dir(temp, "nng_files_perms_test"); + if (geteuid() == 0) { + ConveySkip("Cannot test permissions as root"); + } So(nni_plat_file_put(file, "abc", 4) == 0); Reset({ nni_plat_file_delete(file); diff --git a/tests/resolv.c b/tests/resolv.c index 0678b05f..d1d3b2fe 100644 --- a/tests/resolv.c +++ b/tests/resolv.c @@ -129,7 +129,9 @@ TestMain("Resolver", { // Travis CI has moved some of their services to host that // apparently don't support IPv6 at all. This is very sad. - if (getenv("TRAVIS") != NULL) { + // CircleCI 2.0 is in the same boat. (Amazon to blame.) + if ((getenv("TRAVIS") != NULL) || + (getenv("CIRCLECI") != NULL)) { ConveySkip("IPv6 missing from CI provider"); } -- cgit v1.2.3-70-g09d2