diff options
| -rw-r--r-- | lib/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 17 | ||||
| -rw-r--r-- | tests/data/test1221 | 2 | ||||
| -rw-r--r-- | tests/data/test1222 | 2 | ||||
| -rwxr-xr-x | tests/objnames-test08.sh (renamed from lib/objnames-test08.sh) | 6 | ||||
| -rwxr-xr-x | tests/objnames-test10.sh (renamed from lib/objnames-test10.sh) | 6 | ||||
| -rw-r--r-- | tests/objnames.inc (renamed from lib/objnames.inc) | 0 |
7 files changed, 18 insertions, 18 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index a7b5262b9..72ee2ff9a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 64f5789de..6c995e168 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -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 @@ -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 diff --git a/tests/data/test1221 b/tests/data/test1221 index 261cb8c60..15700f449 100644 --- a/tests/data/test1221 +++ b/tests/data/test1221 @@ -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> diff --git a/tests/data/test1222 b/tests/data/test1222 index 51edc9702..5eab55ba1 100644 --- a/tests/data/test1222 +++ b/tests/data/test1222 @@ -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> diff --git a/lib/objnames-test08.sh b/tests/objnames-test08.sh index 485975765..0e4a252e2 100755 --- a/lib/objnames-test08.sh +++ b/tests/objnames-test08.sh @@ -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 @@ -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" @@ -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 diff --git a/lib/objnames-test10.sh b/tests/objnames-test10.sh index 62184b864..3d101dcee 100755 --- a/lib/objnames-test10.sh +++ b/tests/objnames-test10.sh @@ -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 @@ -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" @@ -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 diff --git a/lib/objnames.inc b/tests/objnames.inc index e362f6e8e..e362f6e8e 100644 --- a/lib/objnames.inc +++ b/tests/objnames.inc |