Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: move objnames-* from lib into tests #3470

Closed
wants to merge 1 commit into from
Closed

tests: move objnames-* from lib into tests #3470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions lib/Makefile.am
View file
Open in desktop
Expand Up @@ -29,8 +29,7 @@ EXTRA_DIST = Makefile.m32 config-win32.h \
makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \
config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \
config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \
firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \
objnames-test08.sh objnames-test10.sh objnames.inc
firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl

lib_LTLIBRARIES = libcurl.la

Expand Down
17 changes: 9 additions & 8 deletions tests/Makefile.am
View file
Open in desktop
Expand Up @@ -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
# you should have received as part of this distribution. The terms
Expand All @@ -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)/uuid.py $(IMP)/version.py smbserver.py curl_test_data.py

EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl getpart.pm \
FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl 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 \
CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl \
manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py \
negtelnetserver.py $(SMBDEPS)
EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl \
getpart.pm FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl \
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 \
CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl \
manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py \
negtelnetserver.py $(SMBDEPS) objnames-test08.sh objnames-test10.sh \
objnames.inc

DISTCLEANFILES = configurehelp.pm

Expand Down
2 changes: 1 addition & 1 deletion tests/data/test1221
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ none
10 chars object name generation testing
</name>
<command option="no-output,no-include" type="shell">
%SRCDIR/../lib/objnames-test10.sh %SRCDIR
%SRCDIR/objnames-test10.sh %SRCDIR
</command>
</client>

Expand Down
2 changes: 1 addition & 1 deletion tests/data/test1222
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@ none
8 chars object name generation testing
</name>
<command option="no-output,no-include" type="shell">
%SRCDIR/../lib/objnames-test08.sh %SRCDIR
%SRCDIR/objnames-test08.sh %SRCDIR
</command>
</client>

Expand Down
6 changes: 3 additions & 3 deletions lib/objnames-test08.sh → tests/objnames-test08.sh
View file
Open in desktop
Expand Up @@ -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
# * you should have received as part of this distribution. The terms
Expand Down Expand Up @@ -48,7 +48,7 @@ fi

srcdir=${1}

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

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

#
# Some curl_8char_object_name() unit tests
Expand Down
6 changes: 3 additions & 3 deletions lib/objnames-test10.sh → tests/objnames-test10.sh
View file
Open in desktop
Expand Up @@ -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
# * you should have received as part of this distribution. The terms
Expand Down Expand Up @@ -48,7 +48,7 @@ fi

srcdir=${1}

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

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

#
# Some curl_10char_object_name() unit tests
Expand Down
0 lib/objnames.inc → tests/objnames.inc
View file
Open in desktop
File renamed without changes.