tests: move objnames-* from lib into tests (ea77fec1) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.am

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,8 +29,7 @@ EXTRA_DIST = Makefile.m32 config-win32.h \
	makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \		makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \
	config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \		config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \
	config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \		config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \
	firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \		firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl
	objnames-test08.sh objnames-test10.sh objnames.inc

	lib_LTLIBRARIES = libcurl.la		lib_LTLIBRARIES = libcurl.la

tests/Makefile.am

+9 −8

tests/data/test1221

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@ none
	10 chars object name generation testing		10 chars object name generation testing
	</name>		</name>
	<command option="no-output,no-include" type="shell">		<command option="no-output,no-include" type="shell">
	%SRCDIR/../lib/objnames-test10.sh %SRCDIR		%SRCDIR/objnames-test10.sh %SRCDIR
	</command>		</command>
	</client>		</client>

tests/data/test1222

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@ none
	8 chars object name generation testing		8 chars object name generation testing
	</name>		</name>
	<command option="no-output,no-include" type="shell">		<command option="no-output,no-include" type="shell">
	%SRCDIR/../lib/objnames-test08.sh %SRCDIR		%SRCDIR/objnames-test08.sh %SRCDIR
	</command>		</command>
	</client>		</client>

lib/objnames-test08.sh→tests/objnames-test08.sh

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@
	# * \| (__\| \|_\| \| _ <\| \|___		# * \| (__\| \|_\| \| _ <\| \|___
	# * \___\|\___/\|_\| \_\_____\|		# * \___\|\___/\|_\| \_\_____\|
	# *		# *
	# * Copyright (C) 2013, Daniel Stenberg, <daniel@haxx.se>, et al.		# * Copyright (C) 2013 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
	# *		# *
	# * This software is licensed as described in the file COPYING, which		# * This software is licensed as described in the file COPYING, which
	# * you should have received as part of this distribution. The terms		# * you should have received as part of this distribution. The terms
	@@ -48,7 +48,7 @@ fi

	srcdir=${1}		srcdir=${1}

	if test -f "$srcdir/../lib/objnames.inc"; then		if test -f "$srcdir/objnames.inc"; then
	:		:
	else		else
	echo "$0: Missing objnames.inc"		echo "$0: Missing objnames.inc"
	@@ -72,7 +72,7 @@ list_obj_uniq=$logdir/${tstnum}_list_obj_uniq
	# Source curl_8char_object_name() function definition		# Source curl_8char_object_name() function definition
	#		#

	. $srcdir/../lib/objnames.inc		. $srcdir/objnames.inc

	#		#
	# Some curl_8char_object_name() unit tests		# Some curl_8char_object_name() unit tests

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@
	# \| (__\| \|_\| \| _ <\| \|___		# \| (__\| \|_\| \| _ <\| \|___
	# \___\|\___/\|_\| \_\_____\|		# \___\|\___/\|_\| \_\_____\|
	#		#
	# Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.		# Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
	#		#
	# This software is licensed as described in the file COPYING, which		# This software is licensed as described in the file COPYING, which
	# you should have received as part of this distribution. The terms		# you should have received as part of this distribution. The terms
	@@ -31,13 +31,14 @@ SMBDEPS = $(IMP)/__init__.py $(IMP)/nmb.py $(IMP)/nt_errors.py \
	$(IMP)/smbserver.py $(IMP)/spnego.py $(IMP)/structure.py \		$(IMP)/smbserver.py $(IMP)/spnego.py $(IMP)/structure.py \
	$(IMP)/uuid.py $(IMP)/version.py smbserver.py curl_test_data.py		$(IMP)/uuid.py $(IMP)/version.py smbserver.py curl_test_data.py

	EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl getpart.pm \		EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl \
	FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl valgrind.pm ftp.pm \		getpart.pm FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl \
	sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1 \		valgrind.pm ftp.pm sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1 \
	serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl \		serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl \
	CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl \		CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl \
	manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py \		manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py \
	negtelnetserver.py $(SMBDEPS)		negtelnetserver.py $(SMBDEPS) objnames-test08.sh objnames-test10.sh \
			objnames.inc

	DISTCLEANFILES = configurehelp.pm		DISTCLEANFILES = configurehelp.pm