From 2fe8f3e197320df74e5882d86b14a2245279a79f Mon Sep 17 00:00:00 2001 From: Michael Greenberg Date: Fri, 15 May 2020 11:08:18 -0700 Subject: [PATCH 1/6] add modernish tests --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index eeecc09..82da47e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,9 @@ script: - make -C src/ test - TEST_DEBUG=1 TEST_TIMEOUT=15 make -C tests/ test # higher timeout for CI (default is 9s) + # RUN MODERNISH TESTS + - yes n | modernish/install.sh -s smoosh + # BUILD AND TEST WEB SERVER - (cd web; bundle install) - sh web/src/mk_config.sh $(pwd) >web/src/config.yml From 615c96a3a96ce4e6a2acf416568afac9d608b5ec Mon Sep 17 00:00:00 2001 From: Michael Greenberg Date: Fri, 15 May 2020 11:10:05 -0700 Subject: [PATCH 2/6] add modernish tests back in --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82da47e..7b0c1a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,8 +71,8 @@ script: - make -C src/ test - TEST_DEBUG=1 TEST_TIMEOUT=15 make -C tests/ test # higher timeout for CI (default is 9s) - # RUN MODERNISH TESTS - - yes n | modernish/install.sh -s smoosh + # RUN MODERNISH TESTS (WHICH WILL HAVE SOME FAILURES WITH DASH'S PARSER) + - yes n | modernish/install.sh -s smoosh || true # BUILD AND TEST WEB SERVER - (cd web; bundle install) From 95662b3898558fa73e84e520bfebd91a8ced49ad Mon Sep 17 00:00:00 2001 From: Michael Greenberg Date: Fri, 15 May 2020 11:37:43 -0700 Subject: [PATCH 3/6] debugging wc -m (???) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7b0c1a0..61b5ae3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,6 +73,7 @@ script: # RUN MODERNISH TESTS (WHICH WILL HAVE SOME FAILURES WITH DASH'S PARSER) - yes n | modernish/install.sh -s smoosh || true + - if ! { cat README.md | command wc -m >/dev/null ; }; then echo $?; fi # BUILD AND TEST WEB SERVER - (cd web; bundle install) From 0b6237b9047ee1a2726eff5ab9f1b01d7f96e1b5 Mon Sep 17 00:00:00 2001 From: Michael Greenberg Date: Wed, 3 Jun 2020 09:23:01 -0700 Subject: [PATCH 4/6] better modernish testing --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61b5ae3..b4bf951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,8 +72,9 @@ script: - TEST_DEBUG=1 TEST_TIMEOUT=15 make -C tests/ test # higher timeout for CI (default is 9s) # RUN MODERNISH TESTS (WHICH WILL HAVE SOME FAILURES WITH DASH'S PARSER) - - yes n | modernish/install.sh -s smoosh || true - - if ! { cat README.md | command wc -m >/dev/null ; }; then echo $?; fi + - yes n | modernish/install.sh -s smoosh 2>&1 | tee modernish.log || true + - [ $(grep BUG modernish.log) = "LOCALVARS TRAPPRSUBSH BUG_MULTIBYTE" ] || echo "Expected BUG_MULTIBYTE (and no others)" + - [ $(grep FAIL modernish.log) = "002: ASCII chars and control char constants - FAIL" ] || echo "Expected ASCII char failure" # BUILD AND TEST WEB SERVER - (cd web; bundle install) From 9757d97428bce93f7403e8f17b558954ad26bc98 Mon Sep 17 00:00:00 2001 From: Michael Greenberg Date: Wed, 3 Jun 2020 09:34:05 -0700 Subject: [PATCH 5/6] fix typo --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b4bf951..fe6fbeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,8 +73,8 @@ script: # RUN MODERNISH TESTS (WHICH WILL HAVE SOME FAILURES WITH DASH'S PARSER) - yes n | modernish/install.sh -s smoosh 2>&1 | tee modernish.log || true - - [ $(grep BUG modernish.log) = "LOCALVARS TRAPPRSUBSH BUG_MULTIBYTE" ] || echo "Expected BUG_MULTIBYTE (and no others)" - - [ $(grep FAIL modernish.log) = "002: ASCII chars and control char constants - FAIL" ] || echo "Expected ASCII char failure" + - [ "$(grep BUG modernish.log)" = " LOCALVARS TRAPPRSUBSH BUG_MULTIBYTE" ] || echo "Expected BUG_MULTIBYTE (and no others)" + - [ "$(grep FAIL modernish.log)" = " 002: ASCII chars and control char constants - FAIL" ] || echo "Expected ASCII char failure" # BUILD AND TEST WEB SERVER - (cd web; bundle install) From 3583ae503b0ef3c52b4e8fc2c320f00c200903c2 Mon Sep 17 00:00:00 2001 From: Michael Greenberg Date: Wed, 3 Jun 2020 09:46:18 -0700 Subject: [PATCH 6/6] oh wow someone really screwed the pooch on yaml here --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe6fbeb..6cc03d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,8 +73,8 @@ script: # RUN MODERNISH TESTS (WHICH WILL HAVE SOME FAILURES WITH DASH'S PARSER) - yes n | modernish/install.sh -s smoosh 2>&1 | tee modernish.log || true - - [ "$(grep BUG modernish.log)" = " LOCALVARS TRAPPRSUBSH BUG_MULTIBYTE" ] || echo "Expected BUG_MULTIBYTE (and no others)" - - [ "$(grep FAIL modernish.log)" = " 002: ASCII chars and control char constants - FAIL" ] || echo "Expected ASCII char failure" + - test "$(grep BUG modernish.log)" = ' LOCALVARS TRAPPRSUBSH BUG_MULTIBYTE' || echo "Expected BUG_MULTIBYTE (and no others)" + - test "$(grep FAIL modernish.log | cut -c3,4,5)" = '002' || echo 'Expected ASCII char failure' # BUILD AND TEST WEB SERVER - (cd web; bundle install)