Merge native cygwin support

author: Brent Cook <bcook@openbsd.org> 2015-03-21 19:08:04 -0500
committer: Brent Cook <bcook@openbsd.org> 2015-03-21 19:08:04 -0500
commit: dcf31221efbc0c3ceed401478debccc2af38a459 (patch)
tree: 3f7f8adc19c161264ae8b17dfcb942c518c6eb0f /update.sh
parent: 4d122c0be6a677e047999e42e1ce2d36268a883f (diff)
parent: 45065de1bafde1d34acd2cab1b8460663074961c (diff)
download: portable-dcf31221efbc0c3ceed401478debccc2af38a459.tar.gz
portable-dcf31221efbc0c3ceed401478debccc2af38a459.tar.bz2
portable-dcf31221efbc0c3ceed401478debccc2af38a459.zip
1 files changed, 3 insertions, 65 deletions
diff --git a/update.sh b/update.sh
index c4d33e8..85f8331 100755
--- a/update.sh
+++ b/update.sh
@@ -200,9 +200,6 @@ for i in `find $libcrypto_regress -name '*.c'`; do
         $CP "$i" tests
 done
-# the BIO tests rely on resolver results that are OS and environment-specific
-rm tests/biotest.c
 # copy libc tests
 $CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c
 $CP $libc_regress/explicit_bzero/explicit_bzero.c tests
@@ -213,71 +210,12 @@ $CP $libssl_regress/ssl/testssl tests
 for i in `find $libssl_regress -name '*.c'`; do
         $CP "$i" tests
 done
 $CP $libssl_regress/certs/ca.pem tests
 $CP $libssl_regress/certs/server.pem tests
-# setup test drivers
-# do not directly run all test programs
-test_drivers=(
-        aeadtest
-        evptest
-        pq_test
-        ssltest
-        arc4randomforktest
-        pidwraptest
-)
-tests_posix_only=(
-        arc4randomforktest
-        explicit_bzero
-        pidwraptest
-)
-$CP $libc_src/string/memmem.c tests/
-(cd tests
-        $CP Makefile.am.tpl Makefile.am
-        for i in `ls -1 *.c|sort|grep -v memmem.c`; do
-                TEST=`echo $i|sed -e "s/\.c//"`
-                if [[ ${tests_posix_only[*]} =~ "$TEST" ]]; then
-                        echo "if !HOST_WIN" >> Makefile.am
-                fi
-                if ! [[ ${test_drivers[*]} =~ "$TEST" ]]; then
-                        echo "TESTS += $TEST" >> Makefile.am
-                fi
-                echo "check_PROGRAMS += $TEST" >> Makefile.am
-                echo "${TEST}_SOURCES = $i" >> Makefile.am
-                if [[ ${TEST} = "explicit_bzero" ]]; then
-                        echo "if !HAVE_MEMMEM" >> Makefile.am
-                        echo "explicit_bzero_SOURCES += memmem.c" >> Makefile.am
-                        echo "endif" >> Makefile.am
-                fi
-                if [[ ${tests_posix_only[*]} =~ "$TEST" ]]; then
-                        echo "endif" >> Makefile.am
-                fi
-        done
-)
-$CP $libcrypto_regress/evp/evptests.txt tests
-$CP $libcrypto_regress/aead/aeadtests.txt tests
-$CP $libcrypto_regress/pqueue/expected.txt tests/pq_expected.txt
 chmod 755 tests/testssl
-for i in "${test_drivers[@]}"; do
-        if [ -e tests/${i}.sh ]; then
-                if [[ ${tests_posix_only[*]} =~ "$i" ]]; then
-                        echo "if !HOST_WIN" >> tests/Makefile.am
-                fi
-                if ! [[ ${tests_disabled[*]} =~ "$i" ]]; then
-                        echo "TESTS += ${i}.sh" >> tests/Makefile.am
-                fi
-                if [[ ${tests_posix_only[*]} =~ "$i" ]]; then
-                        echo "endif" >> tests/Makefile.am
-                fi
-                echo "EXTRA_DIST += ${i}.sh" >> tests/Makefile.am
-        fi
-done
-echo "EXTRA_DIST += aeadtests.txt" >> tests/Makefile.am
-echo "EXTRA_DIST += evptests.txt" >> tests/Makefile.am
-echo "EXTRA_DIST += pq_expected.txt" >> tests/Makefile.am
-echo "EXTRA_DIST += testssl ca.pem server.pem" >> tests/Makefile.am
+# add headers
 (cd include/openssl
        $CP Makefile.am.tpl Makefile.am
        for i in `ls -1 *.h|sort`; do
@@ -285,8 +223,8 @@ echo "EXTRA_DIST += testssl ca.pem server.pem" >> tests/Makefile.am
        done
 )
-echo "copying manpages"
 # copy manpages
+echo "copying manpages"
 (cd man
        $CP Makefile.am.tpl Makefile.am
author	Brent Cook <bcook@openbsd.org>	2015-03-21 19:08:04 -0500
committer	Brent Cook <bcook@openbsd.org>	2015-03-21 19:08:04 -0500
commit	dcf31221efbc0c3ceed401478debccc2af38a459 (patch)
tree	3f7f8adc19c161264ae8b17dfcb942c518c6eb0f /update.sh
parent	4d122c0be6a677e047999e42e1ce2d36268a883f (diff)
parent	45065de1bafde1d34acd2cab1b8460663074961c (diff)
download	portable-dcf31221efbc0c3ceed401478debccc2af38a459.tar.gz portable-dcf31221efbc0c3ceed401478debccc2af38a459.tar.bz2 portable-dcf31221efbc0c3ceed401478debccc2af38a459.zip

diff --git a/update.sh b/update.sh index c4d33e8..85f8331 100755 --- a/update.sh +++ b/update.sh
@@ -200,9 +200,6 @@ for i in `find $libcrypto_regress -name '*.c'`; do
200	$CP "$i" tests	200	$CP "$i" tests
201	done	201	done
202		202
203	# the BIO tests rely on resolver results that are OS and environment-specific
204	rm tests/biotest.c
205
206	# copy libc tests	203	# copy libc tests
207	$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c	204	$CP $libc_regress/arc4random-fork/arc4random-fork.c tests/arc4randomforktest.c
208	$CP $libc_regress/explicit_bzero/explicit_bzero.c tests	205	$CP $libc_regress/explicit_bzero/explicit_bzero.c tests
@@ -213,71 +210,12 @@ $CP $libssl_regress/ssl/testssl tests
213	for i in `find $libssl_regress -name '*.c'`; do	210	for i in `find $libssl_regress -name '*.c'`; do
214	$CP "$i" tests	211	$CP "$i" tests
215	done	212	done
		213
216	$CP $libssl_regress/certs/ca.pem tests	214	$CP $libssl_regress/certs/ca.pem tests
217	$CP $libssl_regress/certs/server.pem tests	215	$CP $libssl_regress/certs/server.pem tests
218
219	# setup test drivers
220	# do not directly run all test programs
221	test_drivers=(
222	aeadtest
223	evptest
224	pq_test
225	ssltest
226	arc4randomforktest
227	pidwraptest
228	)
229	tests_posix_only=(
230	arc4randomforktest
231	explicit_bzero
232	pidwraptest
233	)
234	$CP $libc_src/string/memmem.c tests/
235	(cd tests
236	$CP Makefile.am.tpl Makefile.am
237
238	for i in `ls -1 *.c\|sort\|grep -v memmem.c`; do
239	TEST=`echo $i\|sed -e "s/\.c//"`
240	if [[ ${tests_posix_only[*]} =~ "$TEST" ]]; then
241	echo "if !HOST_WIN" >> Makefile.am
242	fi
243	if ! [[ ${test_drivers[*]} =~ "$TEST" ]]; then
244	echo "TESTS += $TEST" >> Makefile.am
245	fi
246	echo "check_PROGRAMS += $TEST" >> Makefile.am
247	echo "${TEST}_SOURCES = $i" >> Makefile.am
248	if [[ ${TEST} = "explicit_bzero" ]]; then
249	echo "if !HAVE_MEMMEM" >> Makefile.am
250	echo "explicit_bzero_SOURCES += memmem.c" >> Makefile.am
251	echo "endif" >> Makefile.am
252	fi
253	if [[ ${tests_posix_only[*]} =~ "$TEST" ]]; then
254	echo "endif" >> Makefile.am
255	fi
256	done
257	)
258	$CP $libcrypto_regress/evp/evptests.txt tests
259	$CP $libcrypto_regress/aead/aeadtests.txt tests
260	$CP $libcrypto_regress/pqueue/expected.txt tests/pq_expected.txt
261	chmod 755 tests/testssl	216	chmod 755 tests/testssl
262	for i in "${test_drivers[@]}"; do
263	if [ -e tests/${i}.sh ]; then
264	if [[ ${tests_posix_only[*]} =~ "$i" ]]; then
265	echo "if !HOST_WIN" >> tests/Makefile.am
266	fi
267	if ! [[ ${tests_disabled[*]} =~ "$i" ]]; then
268	echo "TESTS += ${i}.sh" >> tests/Makefile.am
269	fi
270	if [[ ${tests_posix_only[*]} =~ "$i" ]]; then
271	echo "endif" >> tests/Makefile.am
272	fi
273	echo "EXTRA_DIST += ${i}.sh" >> tests/Makefile.am
274	fi
275	done
276	echo "EXTRA_DIST += aeadtests.txt" >> tests/Makefile.am
277	echo "EXTRA_DIST += evptests.txt" >> tests/Makefile.am
278	echo "EXTRA_DIST += pq_expected.txt" >> tests/Makefile.am
279	echo "EXTRA_DIST += testssl ca.pem server.pem" >> tests/Makefile.am
280		217
		218	# add headers
281	(cd include/openssl	219	(cd include/openssl
282	$CP Makefile.am.tpl Makefile.am	220	$CP Makefile.am.tpl Makefile.am
283	for i in `ls -1 *.h\|sort`; do	221	for i in `ls -1 *.h\|sort`; do
@@ -285,8 +223,8 @@ echo "EXTRA_DIST += testssl ca.pem server.pem" >> tests/Makefile.am
285	done	223	done
286	)	224	)
287		225
288	echo "copying manpages"
289	# copy manpages	226	# copy manpages
		227	echo "copying manpages"
290	(cd man	228	(cd man
291	$CP Makefile.am.tpl Makefile.am	229	$CP Makefile.am.tpl Makefile.am
292		230