Merge pull request #11 from kvz/osxfailpasses

Fix Travis OSX testing
This commit is contained in:
Kevin van Zonneveld 2016-02-23 10:23:23 +01:00
commit c1fecf33c3
2 changed files with 9 additions and 11 deletions

View File

@ -51,6 +51,7 @@ Although *3* introduces a node.js dependency, this does allow for easy version p
### master (Unreleased) ### master (Unreleased)
- Fix Travis OSX testing (before, it would silently pass failures) (#10)
- Enable dashes in long, GNU style options, as well as numbers (thanks @zbeekman) - Enable dashes in long, GNU style options, as well as numbers (thanks @zbeekman)
### v2.0.0 (2016-02-17) ### v2.0.0 (2016-02-17)

View File

@ -147,17 +147,14 @@ for scenario in $(echo ${scenarios}); do
fi fi
fi fi
diff \ if ! diff --strip-trailing-cr "${__dir}/fixture/${scenario}.${typ}" "${curFile}"; then
--strip-trailing-cr \ echo -e "\n\n==> MISMATCH OF: ${scenario}.${typ} ---^"
"${__dir}/fixture/${scenario}.${typ}" \ echo -e "\n\n==> EXPECTED STDIO: "
"${curFile}" || ( \ cat "${__dir}/fixture/${scenario}.stdio" || true
echo -e "\n\n==> MISMATCH OF: ${typ}"; echo -e "\n\n==> ACTUAL STDIO: "
echo -e "\n\n==> EXPECTED STDIO: "; cat "${__accptstTmpDir}/${scenario}.stdio" || true
cat "${__dir}/fixture/${scenario}.stdio"; exit 1
echo -e "\n\n==> ACTUAL STDIO: "; fi
cat "${__accptstTmpDir}/${scenario}.stdio";
exit 1; \
)
echo "✓" echo "✓"
done done