--- a/Makefile Wed Aug 21 13:14:39 2019 -0700
+++ b/Makefile Fri Aug 23 17:03:42 2019 -0400
@@ -16,6 +16,7 @@
export LC_ALL=C
TESTFLAGS ?= $(shell echo $$HGTESTFLAGS)
OSXVERSIONFLAGS ?= $(shell echo $$OSXVERSIONFLAGS)
+CARGO = cargo
# Set this to e.g. "mingw32" to use a non-default compiler.
COMPILER=
@@ -110,6 +111,10 @@
check: tests
tests:
+ # Run Rust tests if cargo is installed
+ if command -v $(CARGO) >/dev/null 2>&1; then \
+ cd $(HGROOT)/rust/hg-cpython && $(CARGO) test --quiet --all; \
+ fi
cd tests && $(PYTHON) run-tests.py $(TESTFLAGS)
test-%:
--- a/tests/test-merge-combination.t Wed Aug 21 13:14:39 2019 -0700
+++ b/tests/test-merge-combination.t Fri Aug 23 17:03:42 2019 -0400
@@ -57,7 +57,7 @@
> fi
> else expected=a
> fi
- > got=`hg log -r 3 --template '{files}\n' | tr --delete 'e '`
+ > got=`hg log -r 3 --template '{files}\n' | tr -d 'e '`
> if [ "$got" = "$expected" ]
> then echo "$line$conflicts: agree on \"$got\""
> else echo "$line$conflicts: hg said \"$got\", expected \"$expected\""