summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2020-12-03 13:46:41 -0500
committerDan Davison <dandavison7@gmail.com>2020-12-03 13:46:41 -0500
commit052e3ddfe62a8030a3f65f4947c905d9c0495602 (patch)
tree0bb9096648682360beabdd7b0491516932b9871d
parent8e486dd63ee8c472ecfac9c7859aad766374e3de (diff)
Don't use make
-rw-r--r--.github/workflows/ci.yml4
-rwxr-xr-xtests/test_deprecated_options4
-rwxr-xr-xtests/test_raw_output_matches_git_on_full_repo_history6
3 files changed, 6 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index daf8739f..4f971111 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,7 +59,9 @@ jobs:
command: build
args: --target ${{ matrix.target }} --release
- name: End to end tests
- run: DELTA_BIN=target/${{ matrix.target }}/release/delta make end-to-end-test > /dev/null
+ run: |
+ DELTA_BIN=target/${{ matrix.target }}/release/delta bash tests/test_raw_output_matches_git_on_full_repo_history
+ DELTA_BIN=target/${{ matrix.target }}/release/delta bash tests/test_deprecated_options > /dev/null
- name: Run executable
run: cargo run --release --target ${{ matrix.target }} -- < /dev/null
diff --git a/tests/test_deprecated_options b/tests/test_deprecated_options
index 5ff59801..72617da7 100755
--- a/tests/test_deprecated_options
+++ b/tests/test_deprecated_options
@@ -1,8 +1,6 @@
#!/bin/bash
-# if first arg provided, use it, otherwise default to release
-DELTA_BIN=${1:=./target/release/delta}
-DELTA="$DELTA_BIN --no-gitconfig"
+DELTA="${DELTA_BIN:-./target/release/delta} --no-gitconfig"
foreground_color=red
for decoration_attr in box underline plain; do
diff --git a/tests/test_raw_output_matches_git_on_full_repo_history b/tests/test_raw_output_matches_git_on_full_repo_history
index 667cbd68..d3e407a7 100755
--- a/tests/test_raw_output_matches_git_on_full_repo_history
+++ b/tests/test_raw_output_matches_git_on_full_repo_history
@@ -1,9 +1,7 @@
#!/bin/bash
-# if first arg provided, use it, otherwise default to release
-DELTA_BIN=${1:=./target/release/delta}
-DELTA="$DELTA_BIN --no-gitconfig --raw --max-line-length 0"
-
+DELTA="${DELTA_BIN:-./target/release/delta} --no-gitconfig --raw --max-line-length 0"
ANSIFILTER="./etc/bin/ansifilter"
GIT_ARGS="log --patch --stat --numstat"
+
diff -u <(git $GIT_ARGS | $ANSIFILTER) <(git $GIT_ARGS | $DELTA | $ANSIFILTER)