Add --noaffinity to tests so they don't fail in Travic CI containers.

This commit is contained in:
Geoff Greer 2016-06-23 00:10:46 -07:00
parent 18f9833d26
commit 51121a8f5e
5 changed files with 7 additions and 5 deletions

View file

@ -1,7 +1,7 @@
Setup:
$ . $TESTDIR/setup.sh
$ alias ag="$TESTDIR/../ag --workers=1 --parallel --color"
$ alias ag="$TESTDIR/../ag --noaffinity --workers=1 --parallel --color"
$ printf 'blahfoofooblah\n' > ./fooblah.txt
Highlights are adjacent:

View file

@ -2,7 +2,7 @@ Setup. Note that we have to turn --color on manually since ag detects that
stdout isn't a tty when running in cram.
$ . $TESTDIR/setup.sh
$ alias ag="$TESTDIR/../ag --workers=1 --parallel --color"
$ alias ag="$TESTDIR/../ag --noaffinity --workers=1 --parallel --color"
$ printf 'foo\n' > ./blah.txt
$ printf 'bar\n' >> ./blah.txt

View file

@ -2,7 +2,7 @@ Setup:
$ . $TESTDIR/setup.sh
$ unalias ag
$ alias ag="$TESTDIR/../ag --nocolor --workers=1"
$ alias ag="$TESTDIR/../ag --noaffinity --nocolor --workers=1"
$ printf "blah\n" > blah.txt
$ printf "blah2\n" >> blah.txt
$ printf "blah_OTHER\n" > other_file.txt

View file

@ -2,7 +2,7 @@ Setup:
$ . $TESTDIR/setup.sh
$ unalias ag
$ alias ag="$TESTDIR/../ag --nocolor --workers=1"
$ alias ag="$TESTDIR/../ag --noaffinity --nocolor --workers=1"
$ printf "foo bar\n" > passthrough_test.txt
$ printf "zoo zar\n" >> passthrough_test.txt
$ printf "foo test\n" >> passthrough_test.txt

View file

@ -3,5 +3,7 @@
# All cram tests should use this. Make sure that "ag" runs the version
# of ag we just built, and make the output really simple.
# --noaffinity is to stop Travis CI from erroring (it runs in containers so pthread_setaffinity_np fails)
# --workers=1 is to keep all output ordered, to make testing output easier
# shellcheck disable=2139
alias ag="$TESTDIR/../ag --nocolor --workers=1 --parallel"
alias ag="$TESTDIR/../ag --noaffinity --nocolor --workers=1 --parallel"