Merge branch 'js/iso8895-test-on-apfs'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 07:41:24 +0000 (16:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2019 07:41:24 +0000 (16:41 +0900)
Test fix on APFS that is incapable of store paths in Latin-1.

* js/iso8895-test-on-apfs:
t9822: skip tests if file names cannot be ISO-8859-1 encoded

1  2 
t/t9822-git-p4-path-encoding.sh
index 1bf7635016f54385912e7bd830eada93810a4bfc,de0b46581d3207baa538654f3a76db721f532185..572d395498e30a3743b77c577d7c4b91d714b392
@@@ -7,6 -7,13 +7,13 @@@ test_description='Clone repositories wi
  UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt"
  ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt"
  
+ ISO8859="$(printf "$ISO8859_ESCAPED")" &&
+ echo content123 >"$ISO8859" &&
+ rm "$ISO8859" || {
+       skip_all="fs does not accept ISO-8859-1 filenames"
+       test_done
+ }
  test_expect_success 'start p4d' '
        start_p4d
  '
@@@ -67,4 -74,8 +74,4 @@@ test_expect_success 'Delete iso8859-1 e
        )
  '
  
 -test_expect_success 'kill p4d' '
 -      kill_p4d
 -'
 -
  test_done