tests: move objnames-* from lib into tests

Since they're used purely for testing purposes, I think they should
rather be stored there.

Closes #3470

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a7b5262b9181f917b8dd1b1654cc4aeafd366a02..72ee2ff9a4004d3d9da2392a11470c4d6bfc39a5 100644 (file)
--- 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 64f5789de5ae7861d1bd54adcf85bbe5e8d50631..6c995e168be9dc366720abdb6ec1c6cf580beeb1 100644 (file)
--- 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 261cb8c607defbebae50824e7946ab95ec458dbc..15700f44939b53d5a994fc900b22db48af53dac8 100644 (file)
--- 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 51edc9702478ec56a04cf001b818e7416520cdc8..5eab55ba1a183f63dccab33c1f5d075d2d587128 100644 (file)
--- 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
similarity index 97%
rename from lib/objnames-test08.sh
rename to tests/objnames-test08.sh
index 485975765c0c93dc61d014e23b4c40fc4637bc8d..0e4a252e292edba8ca270a128361c498278e2988 100755 (executable)
--- 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
similarity index 97%
rename from lib/objnames-test10.sh
rename to tests/objnames-test10.sh
index 62184b8640a3dc3b8b0e8de7a19f76636493208e..3d101dceed6aea71777b03bec11e1cd33eacf03e 100755 (executable)
--- 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
similarity index 100%
rename from lib/objnames.inc
rename to tests/objnames.inc