sharness/junit: fixes after review

License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
ipfs · Mar 14, 2018 · 1c6bb55 · 1c6bb55
1 parent 78630b2
commit 1c6bb55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/test/sharness/Rules.mk b/test/sharness/Rules.mk
@@ -44,7 +44,7 @@ $(d)/aggregate: $(T_$(d))
 $(d)/test-results/sharness.xml: export TEST_GENERATE_JUNIT=1
 $(d)/test-results/sharness.xml: test_sharness_expensive
 	@echo "*** $@ ***"
-	@(cd $(@D) && ./lib/gen-junit-report.sh)
+	@(cd $(@D)/.. && ./lib/gen-junit-report.sh)
 
 $(d)/clean-test-results:
 	rm -rf $(@D)/test-results

diff --git a/test/sharness/t0080-repo.sh b/test/sharness/t0080-repo.sh
@@ -169,14 +169,13 @@ test_expect_success "'ipfs pin ls --type=all --quiet' is correct" '
 
 test_expect_success "'ipfs refs --unique' is correct" '
   mkdir -p uniques &&
-  cd uniques &&
-  echo "content1" > file1 &&
-  echo "content1" > file2 &&
-  ipfs add -r -q . > ../add_output &&
-  ROOT=$(tail -n1 ../add_output) &&
+  echo "content1" > uniques/file1 &&
+  echo "content1" > uniques/file2 &&
+  ipfs add -r -q uniques > add_output &&
+  ROOT=$(tail -n1 add_output) &&
   ipfs refs --unique $ROOT >expected &&
-  ipfs add -q file1 >unique_hash &&
-  test_cmp expected unique_hash || test_fsh cat ../add_output
+  ipfs add -q uniques/file1 >unique_hash &&
+  test_cmp expected unique_hash || test_fsh cat add_output
 '
 
 test_expect_success "'ipfs refs --unique --recursive' is correct" '