tests: convert unit test 1396 and 1398 into libtests

They were previously unit tests but used only public library functions.

Closes #22471

diff --git a/tests/data/test1396 b/tests/data/test1396
index 3e4555633654180b2bc1818463a10d6356b63366..88062c82985c19886d92f5dfc6a0d8429779983c 100644 (file)
--- a/tests/data/test1396
+++ b/tests/data/test1396
@@ -2,7 +2,6 @@
 <testcase>
 <info>
 <keywords>
-unittest
 curl_easy_escape
 curl_easy_unescape
 </keywords>
@@ -10,9 +9,9 @@ curl_easy_unescape
 
 # Client-side
 <client>
-<features>
-unittest
-</features>
+<tool>
+lib%TESTNUMBER
+</tool>
 <name>
 curl_easy_escape and curl_easy_unescape
 </name>

diff --git a/tests/data/test1398 b/tests/data/test1398
index 025c955562fc39b1148996a7130140900623efad..dde51f6994075321ba43d210c4df754dcc3a5806 100644 (file)
--- a/tests/data/test1398
+++ b/tests/data/test1398
@@ -2,18 +2,17 @@
 <testcase>
 <info>
 <keywords>
-unittest
 curl_msnprintf
 </keywords>
 </info>
 
 # Client-side
 <client>
-<features>
-unittest
-</features>
+<tool>
+lib%TESTNUMBER
+</tool>
 <name>
-curl_msnprintf unit tests
+curl_msnprintf tests
 </name>
 </client>
 

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 89f6a8254634c45a530bc108cc6fbef1f83b8387..0787bfc911665122935c6c70ad5c3439d85bda30 100644 (file)
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -89,6 +89,7 @@ TESTS_C = \
   lib766.c \
   lib1156.c \
   lib1301.c                                                   lib1308.c \
+  lib1396.c           lib1398.c \
   lib1485.c \
   lib1500.c lib1501.c lib1502.c                               lib1506.c \
   lib1507.c lib1508.c lib1509.c lib1510.c lib1511.c lib1512.c lib1513.c \

diff --git a/tests/unit/unit1396.c b/tests/libtest/lib1396.c
similarity index 98%
rename from tests/unit/unit1396.c
rename to tests/libtest/lib1396.c
index 1dd3c171125bbd01a9fcf5f046ccbd3bed3a2174..60d139a8500f69d7897ff9cb7124ddcf1909457c 100644 (file)
--- a/tests/unit/unit1396.c
+++ b/tests/libtest/lib1396.c
@@ -37,7 +37,7 @@ static void t1396_stop(CURL *easy)
   curl_global_cleanup();
 }
 
-static CURLcode test_unit1396(const char *arg)
+static CURLcode test_lib1396(const char *arg)
 {
   CURL *easy;
 

diff --git a/tests/unit/unit1398.c b/tests/libtest/lib1398.c
similarity index 99%
rename from tests/unit/unit1398.c
rename to tests/libtest/lib1398.c
index 2147a4a2830415f174f33d37d66e553c2b6d7058..6fd9cebb04093a28ca6f63159b28101a297ee4fd 100644 (file)
--- a/tests/unit/unit1398.c
+++ b/tests/libtest/lib1398.c
@@ -28,7 +28,7 @@
 #pragma GCC diagnostic ignored "-Wformat"
 #endif
 
-static CURLcode test_unit1398(const char *arg)
+static CURLcode test_lib1398(const char *arg)
 {
   UNITTEST_BEGIN_SIMPLE
 

diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc
index fd05c070e42cc55373ffa62f1b31ac3ad13c1df7..a2bfa273d8c52579de07b7442685b2fce1e0328d 100644 (file)
--- a/tests/unit/Makefile.inc
+++ b/tests/unit/Makefile.inc
@@ -33,7 +33,7 @@ TESTS_C = \
   unit1300.c            unit1302.c unit1303.c unit1304.c unit1305.c \
   unit1307.c            unit1309.c \
   unit1323.c unit1330.c \
-  unit1395.c unit1396.c unit1397.c unit1398.c unit1399.c \
+  unit1395.c            unit1397.c            unit1399.c \
   unit1600.c unit1601.c unit1602.c unit1603.c            unit1605.c unit1606.c \
   unit1607.c unit1608.c unit1609.c unit1610.c unit1611.c unit1612.c unit1614.c \
   unit1615.c unit1616.c                                  unit1620.c \