tests/adjacent_matches.t

@@ -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:

tests/color.t

@@ -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 

tests/count.t

@@ -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

tests/passthrough.t

@@ -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

tests/setup.sh

@@ -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"