test 1222: 8 chars object name generation && test 1221: adjustments (0b3180b4) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.am

+2 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,8 @@ EXTRA_DIST = \
		mk-ca-bundle.vbs \
		msvcproj.foot \
		msvcproj.head \
		objnames-test.sh \
		objnames-test08.sh \
		objnames-test10.sh \
		objnames.inc \
		setup-os400.h \
		vc6libcurl.dsw

lib/objnames-test08.sh

0 → 100755

+217 −0

Original line number	Diff line number	Diff line
		#!/bin/sh
		# ***************************************************************************
		# * _ _ ____ _
		# * Project ___\| \| \| \| _ \\| \|
		# * / __\| \| \| \| \|_) \| \|
		# * \| (__\| \|_\| \| _ <\| \|___
		# * \___\|\___/\|_\| \_\_____\|
		# *
		# * Copyright (C) 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
		# *
		# * This software is licensed as described in the file COPYING, which
		# * you should have received as part of this distribution. The terms
		# * are also available at http://curl.haxx.se/docs/copyright.html.
		# *
		# * You may opt to use, copy, modify, merge, publish, distribute and/or sell
		# * copies of the Software, and permit persons to whom the Software is
		# * furnished to do so, under the terms of the COPYING file.
		# *
		# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
		# * KIND, either express or implied.
		# *
		# ***************************************************************************

		#
		# This Bourne shell script file is used by test case 1222 to do
		# unit testing of curl_8char_object_name() shell function which
		# is defined in file objnames.inc and sourced by this file and
		# any other shell script that may use it.
		#

		#
		# argument validation
		#

		if test $# -eq 1; then
		:
		else
		echo "Usage: ${0} srcdir"
		exit 1
		fi

		if test -f "${1}/runtests.pl"; then
		:
		else
		echo "${0}: Wrong srcdir"
		exit 1
		fi

		srcdir=${1}

		if test -f "$srcdir/../lib/objnames.inc"; then
		:
		else
		echo "$0: Missing objnames.inc"
		exit 1
		fi

		#
		# Some variables
		#

		logdir=log
		tstnum=1222

		list_c=$logdir/${tstnum}_list_c
		list_obj=$logdir/${tstnum}_list_obj
		list_obj_c=$logdir/${tstnum}_list_obj_c
		list_obj_uniq=$logdir/${tstnum}_list_obj_uniq


		#
		# Source curl_8char_object_name() function definition
		#

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

		#
		# Some curl_8char_object_name() unit tests
		#

		echo 'Testing curl_8char_object_name...'
		echo ""

		argstr=123__678__ABC__FGH__KLM__PQRSTUV
		expect=16AFKPQR
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=123__678__ABC__FGH__KLM__PQ.S.UV
		expect=16AFKPQ
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=123__678__ABC..FGH..KLM..PQRSTUV
		expect=16ABC
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=123__678_.ABC._FGH__KLM__PQRSTUV
		expect=16
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=123.567.90ABCDEFGHIJKLMNOPQRSTUV
		expect=123
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=1234567.90A.CDEFGHIJKLMNOPQRSTUV
		expect=1234567
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=1234567890.BCD.FGHIJKLMNOPQRSTUV
		expect=12345678
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=12=45-78+0AB.DE.GHIJKLMNOPQRSTUV
		expect=1470AB
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=1234567890ABCDEFGHIJKLMNOPQRSTUV
		expect=12345678
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=123_567_90A_CDE_GHIJKLMNOPQRSTUV
		expect=159CGHIJ
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=123_567_90A_CDEFGHIJKLMNOPQRSTUV
		expect=159CDEFG
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=123_567_90ABCDEFGHIJKLMNOPQRSTUV
		expect=1590ABCD
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=123_567890ABCDEFGHIJKLMNOPQRSTUV
		expect=1567890A
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		argstr=1234567890ABCDEFGHIJKLMNOPQRSTUV
		expect=12345678
		outstr=`curl_8char_object_name $argstr`
		echo "result: $outstr expected: $expect input: $argstr"

		#
		# Verify that generated object name is distinct for
		# all *.c source files in lib and src subdirectories.
		#

		ls $srcdir/../lib/*.c > $list_c
		ls $srcdir/../src/*.c >> $list_c

		rm -f $list_obj

		for c_fname in `cat $list_c`; do
		obj_name=`curl_8char_object_name $c_fname`
		echo "$obj_name" >> $list_obj
		done

		sort -u $list_obj > $list_obj_uniq

		cnt_c=`cat $list_c \| wc -l`
		cnt_u=`cat $list_obj_uniq \| wc -l`

		echo ""
		echo ""
		echo ""
		if test $cnt_c -eq $cnt_u; then
		echo "8-characters-or-less generated object names are unique."
		obj_name_clash="no"
		else
		echo "8-characters-or-less generated object names are clashing..."
		obj_name_clash="yes"
		fi

		if test $obj_name_clash = "yes"; then
		#
		# Show clashing object names and respective source file names
		#
		echo ""
		paste $list_obj $list_c \| sort > $list_obj_c
		prev_match="no"
		prev_line="unknown"
		prev_obj_name="unknown"
		while read this_line; do
		obj_name=`echo "$this_line" \| cut -f1`
		if test "x$obj_name" = "x$prev_obj_name"; then
		if test "x$prev_match" != "xyes"; then
		echo "$prev_line"
		echo "$this_line"
		prev_match="yes"
		else
		echo "$this_line"
		fi
		else
		prev_match="no"
		fi
		prev_line=$this_line
		prev_obj_name=$obj_name
		done < $list_obj_c
		fi

		rm -f $list_c
		rm -f $list_obj
		rm -f $list_obj_c
		rm -f $list_obj_uniq

		# end of objnames-test.sh

lib/objnames-test.sh→lib/objnames-test10.sh

+11 −5

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

		if ! test $# -eq 1; then
		if test $# -eq 1; then
		:
		else
		echo "Usage: ${0} srcdir"
		exit 1
		fi

		if ! test -f "${1}/runtests.pl"; then
		if test -f "${1}/runtests.pl"; then
		:
		else
		echo "${0}: Wrong srcdir"
		exit 1
		fi

		srcdir=${1}

		if ! test -f "$srcdir/../lib/objnames.inc"; then
		if test -f "$srcdir/../lib/objnames.inc"; then
		:
		else
		echo "$0: Missing objnames.inc"
		exit 1
		fi
		@@ -208,4 +214,4 @@ rm -f $list_obj
		rm -f $list_obj_c
		rm -f $list_obj_uniq

		# end of objnames-test.sh
		# end of objnames-test10.sh

lib/objnames.inc

+22 −0

Original line number	Diff line number	Diff line
		@@ -82,4 +82,26 @@ curl_10char_object_name() {
		-e 's:^$..........$.*:\1:'
		}

		#
		# curl_8char_object_name
		#
		# Same as curl_10char_object_name() description and details above, except
		# that object name is limited to 8 charcters maximum.
		#

		curl_8char_object_name() {
		echo "${1}" \| \
		sed -e 's:.*/::' \
		-e 's:[.].*::' \
		-e 'y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:' \
		-e 's:[^ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_]:_:g' \
		-e 's:__*:_:g' \
		-e 's:$[^_]$[^_]_$.$:\1\2:' \
		-e 's:$[^_]$$[^_]$[^_]_$.$:\1\2\3:' \
		-e 's:$[^_]$$[^_]$$[^_]$[^_]_$.$:\1\2\3\4:' \
		-e 's:$[^_]$$[^_]$$[^_]$$[^_]$[^_]_$.$:\1\2\3\4\5:' \
		-e 's:$[^_]$$[^_]$$[^_]$$[^_]$$[^_]$[^_]_$.$:\1\2\3\4\5\6:' \
		-e 's:^$........$.*:\1:'
		}

		# end of objectname.inc

tests/data/Makefile.am

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \
		test1126 test1127 test1128 test1129 test1130 test1131 test1132 \
		test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
		test1208 test1209 test1210 test1211 \
		test1220 test1221 \
		test1220 test1221 test1222 \
		test1300 test1301 test1302 test1303 test1304 test1305 \
		test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \
		test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \