Skip to content

Commit

Permalink
test suite: Skip an expected make test case failure in centos6 CI
Browse files Browse the repository at this point in the history
  • Loading branch information
scop committed Jun 27, 2017
1 parent 089288d commit 4d5785f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ before_install:
- docker build -t bashcomp:$DIST -f test/docker/Dockerfile-$DIST .

script:
- docker run -e CI=true -t bashcomp:$DIST test/docker/docker-script.sh
- docker run -e CI=true -e DIST=$DIST -t bashcomp:$DIST test/docker/docker-script.sh
18 changes: 11 additions & 7 deletions test/lib/completions/make.exp
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,18 @@ assert_complete_dir $targets "make .cache/" $dir $test
sync_after_int


# FIXME: for some reason this fails in centos6, even though the behavior
# appears to be correct; skip in CI for now.
set test "\"make .cache/.<TAB>\" should complete hidden targets"
set dir $::srcdir/fixtures/make
set targets ".1 .2"
assert_complete_dir $targets "make .cache/." $dir $test \
-expect-cmd-minus "."


sync_after_int
if {[info exists ::env(CI)] && [info exists ::env(DIST)] && $::env(DIST) == "centos6"} {
xfail $test
} else {
set dir $::srcdir/fixtures/make
set targets ".1 .2"
assert_complete_dir $targets "make .cache/." $dir $test \
-expect-cmd-minus "."
sync_after_int
}


set test "\"make <TAB>\" should not show anything in directory without makefile"
Expand Down

0 comments on commit 4d5785f

Please sign in to comment.