From ea8d8aaa135fa7eb4c4db451cce92600aa4017b4 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 12 Feb 2016 05:14:20 +0100 Subject: [PATCH] appveyor: use a POSIX prereq License: MIT Signed-off-by: Christian Couder --- appveyor.yml | 2 +- test/sharness/lib/test-lib.sh | 4 ++++ test/sharness/t0020-init.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a26ec7365..5dffeb0aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,8 @@ clone_folder: c:\go\src\github.com\ipfs\go-ipfs environment: GOPATH: c:\gopath + TEST_VERBOSE: 1 #TEST_NO_FUSE: 1 - #TEST_VERBOSE: 1 #TEST_SUITE: test_sharness_expensive #GOFLAGS: -tags nofuse global: diff --git a/test/sharness/lib/test-lib.sh b/test/sharness/lib/test-lib.sh index 1ceaf859b..e478cd086 100644 --- a/test/sharness/lib/test-lib.sh +++ b/test/sharness/lib/test-lib.sh @@ -44,10 +44,14 @@ test "$TEST_NO_FUSE" != 1 && test_set_prereq FUSE test "$TEST_EXPENSIVE" = 1 && test_set_prereq EXPENSIVE test "$TEST_NO_DOCKER" != 1 && type docker && test_set_prereq DOCKER +TEST_OS=$(uname -s | tr [a-z] [A-Z]) +test expr "$TEST_OS" : "CYGWIN_NT" >/dev/null && test_set_prereq POSIX + if test "$TEST_VERBOSE" = 1; then echo '# TEST_VERBOSE='"$TEST_VERBOSE" echo '# TEST_NO_FUSE='"$TEST_NO_FUSE" echo '# TEST_EXPENSIVE='"$TEST_EXPENSIVE" + echo '# TEST_OS='"$TEST_OS" fi # source our generic test lib diff --git a/test/sharness/t0020-init.sh b/test/sharness/t0020-init.sh index 777fce07f..332a0bcdf 100755 --- a/test/sharness/t0020-init.sh +++ b/test/sharness/t0020-init.sh @@ -19,7 +19,7 @@ test_expect_success "ipfs init fails" ' test_must_fail ipfs init 2> init_fail_out ' -test_expect_success "ipfs init output looks good" ' +test_expect_success POSIX "ipfs init output looks good" ' echo "Error: failed to take lock at $IPFS_PATH: permission denied" > init_fail_exp && test_cmp init_fail_exp init_fail_out '