sharness/junit: fixes after review
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Mar 14, 2018 at 22:33 UTC
ea4a46250c5c97992c6194dbc797ecc27181f7a1
2 files changed
+7
-8
test/sharness/Rules.mk
+1
-1
@@ -44,7 +44,7 @@ $(d)/aggregate: $(T_$(d))
44
$(d)/test-results/sharness.xml: export TEST_GENERATE_JUNIT=1
45
$(d)/test-results/sharness.xml: test_sharness_expensive
46
@echo "*** $@ ***"
47
- @(cd $(@D) && ./lib/gen-junit-report.sh)
47
+ @(cd $(@D)/.. && ./lib/gen-junit-report.sh)
48
49
$(d)/clean-test-results:
50
rm -rf $(@D)/test-results
test/sharness/t0080-repo.sh
+6
-7
@@ -169,14 +169,13 @@ test_expect_success "'ipfs pin ls --type=all --quiet' is correct" '
169
170
test_expect_success "'ipfs refs --unique' is correct" '
171
mkdir -p uniques &&
172
- cd uniques &&
173
- echo "content1" > file1 &&
174
- echo "content1" > file2 &&
175
- ipfs add -r -q . > ../add_output &&
176
- ROOT=$(tail -n1 ../add_output) &&
172
+ echo "content1" > uniques/file1 &&
173
+ echo "content1" > uniques/file2 &&
174
+ ipfs add -r -q uniques > add_output &&
175
+ ROOT=$(tail -n1 add_output) &&
176
ipfs refs --unique $ROOT >expected &&
178
- ipfs add -q file1 >unique_hash &&
179
- test_cmp expected unique_hash || test_fsh cat ../add_output
177
+ ipfs add -q uniques/file1 >unique_hash &&
178
+ test_cmp expected unique_hash || test_fsh cat add_output
179
'
180
181
test_expect_success "'ipfs refs --unique --recursive' is correct" '