Skip to main content

Browse the archive

Revision d008809bb5d1f9a669ee89b77b3a4b6bb7905009 authored by Junio C Hamano on 02 February 2017, 21:36:55 UTC, committed by Junio C Hamano on 02 February 2017, 21:36:55 UTC 
Merge branch 'js/unzip-in-usr-bin-workaround'
 
Test tweak for FreeBSD where /usr/bin/unzip is unsuitable to run
our tests but /usr/local/bin/unzip is usable.

* js/unzip-in-usr-bin-workaround:
  test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/
2 parent s d3a0172 + d98b2c5
Raw File
t4110-apply-scan.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
# Copyright (c) 2005 Robert Fitzsimons
#

test_description='git apply test for patches which require scanning forwards and backwards.

'
. ./test-lib.sh

test_expect_success 'git apply scan' '
	git apply \
		"$TEST_DIRECTORY/t4110/patch1.patch" \
		"$TEST_DIRECTORY/t4110/patch2.patch" \
		"$TEST_DIRECTORY/t4110/patch3.patch" \
		"$TEST_DIRECTORY/t4110/patch4.patch" \
		"$TEST_DIRECTORY/t4110/patch5.patch" &&
	test_cmp new.txt "$TEST_DIRECTORY/t4110/expect"
'

test_done
back to top