提交 ea4a4625 作者: Łukasz Magiera

sharness/junit: fixes after review

License: MIT
Signed-off-by: 's avatarŁukasz Magiera <magik6k@gmail.com>
上级 b2b68c82
...@@ -44,7 +44,7 @@ $(d)/aggregate: $(T_$(d)) ...@@ -44,7 +44,7 @@ $(d)/aggregate: $(T_$(d))
$(d)/test-results/sharness.xml: export TEST_GENERATE_JUNIT=1 $(d)/test-results/sharness.xml: export TEST_GENERATE_JUNIT=1
$(d)/test-results/sharness.xml: test_sharness_expensive $(d)/test-results/sharness.xml: test_sharness_expensive
@echo "*** $@ ***" @echo "*** $@ ***"
@(cd $(@D) && ./lib/gen-junit-report.sh) @(cd $(@D)/.. && ./lib/gen-junit-report.sh)
$(d)/clean-test-results: $(d)/clean-test-results:
rm -rf $(@D)/test-results rm -rf $(@D)/test-results
......
...@@ -169,14 +169,13 @@ test_expect_success "'ipfs pin ls --type=all --quiet' is correct" ' ...@@ -169,14 +169,13 @@ test_expect_success "'ipfs pin ls --type=all --quiet' is correct" '
test_expect_success "'ipfs refs --unique' is correct" ' test_expect_success "'ipfs refs --unique' is correct" '
mkdir -p uniques && mkdir -p uniques &&
cd uniques && echo "content1" > uniques/file1 &&
echo "content1" > file1 && echo "content1" > uniques/file2 &&
echo "content1" > file2 && ipfs add -r -q uniques > add_output &&
ipfs add -r -q . > ../add_output && ROOT=$(tail -n1 add_output) &&
ROOT=$(tail -n1 ../add_output) &&
ipfs refs --unique $ROOT >expected && ipfs refs --unique $ROOT >expected &&
ipfs add -q file1 >unique_hash && ipfs add -q uniques/file1 >unique_hash &&
test_cmp expected unique_hash || test_fsh cat ../add_output test_cmp expected unique_hash || test_fsh cat add_output
' '
test_expect_success "'ipfs refs --unique --recursive' is correct" ' test_expect_success "'ipfs refs --unique --recursive' is correct" '
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论