]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
projects / thirdparty / curl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b950c8c)
tests/libtest: simplify Makefile.inc
authorDaniel Stenberg <daniel@haxx.se>
Wed, 11 Jun 2025 12:30:22 +0000 (14:30 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Wed, 11 Jun 2025 21:26:39 +0000 (23:26 +0200)
Remove all custom LDADD lines

Plus: a few minor tidy-ups in libtest code.

Closes #17594

tests/libtest/Makefile.inc patch | blob | blame | history
tests/libtest/lib1518.c patch | blob | blame | history
tests/libtest/lib525.c patch | blob | blame | history
tests/libtest/lib526.c patch | blob | blame | history

diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 987eecb1440e65cf538e09afdc17325eb8e03451..23570924515c56d799a15327acea62e0df84e08d 100644 (file)
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -82,600 +82,231 @@ LIBTESTPROGS = libauthretry libntlmconnect libprereq                     \
  lib3100 lib3101 lib3102 lib3103 lib3104 lib3105 lib3207 lib3208
 
 libntlmconnect_SOURCES = libntlmconnect.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-libntlmconnect_LDADD = $(TESTUTIL_LIBS)
 
 libauthretry_SOURCES = libauthretry.c $(SUPPORTFILES)
-libauthretry_LDADD = $(TESTUTIL_LIBS)
 
 libprereq_SOURCES = libprereq.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-libprereq_LDADD = $(TESTUTIL_LIBS)
 
 lib500_SOURCES = lib500.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(MULTIBYTE)
-lib500_LDADD = $(TESTUTIL_LIBS)
-
 lib501_SOURCES = lib501.c $(SUPPORTFILES)
-
 lib502_SOURCES = lib502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib502_LDADD = $(TESTUTIL_LIBS)
-
 lib503_SOURCES = lib503.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib503_LDADD = $(TESTUTIL_LIBS)
-
 lib504_SOURCES = lib504.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib504_LDADD = $(TESTUTIL_LIBS)
-
 lib505_SOURCES = lib505.c $(SUPPORTFILES) $(MULTIBYTE)
-
 lib506_SOURCES = lib506.c $(SUPPORTFILES) $(TESTUTIL)
-lib506_LDADD = $(TESTUTIL_LIBS)
-
 lib507_SOURCES = lib507.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib507_LDADD = $(TESTUTIL_LIBS)
-
 lib508_SOURCES = lib508.c $(SUPPORTFILES)
-
 lib509_SOURCES = lib509.c $(SUPPORTFILES)
-
 lib510_SOURCES = lib510.c $(SUPPORTFILES)
-
 lib511_SOURCES = lib511.c $(SUPPORTFILES)
-
 lib512_SOURCES = lib512.c $(SUPPORTFILES)
-
 lib513_SOURCES = lib513.c $(SUPPORTFILES)
-
 lib514_SOURCES = lib514.c $(SUPPORTFILES)
-
 lib515_SOURCES = lib515.c $(SUPPORTFILES)
-
 lib516_SOURCES = lib516.c $(SUPPORTFILES)
-
 lib517_SOURCES = lib517.c $(SUPPORTFILES)
-
 lib518_SOURCES = lib518.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE)
-lib518_LDADD = $(TESTUTIL_LIBS)
-
 lib519_SOURCES = lib519.c $(SUPPORTFILES)
-
 lib520_SOURCES = lib520.c $(SUPPORTFILES)
-
 lib521_SOURCES = lib521.c $(SUPPORTFILES)
-
 lib523_SOURCES = lib523.c $(SUPPORTFILES)
-
 lib524_SOURCES = lib524.c $(SUPPORTFILES)
-
 lib525_SOURCES = lib525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE)
-lib525_LDADD = $(TESTUTIL_LIBS)
-
 lib526_SOURCES = lib526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib526_LDADD = $(TESTUTIL_LIBS)
-
 lib530_SOURCES = lib530.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib530_LDADD = $(TESTUTIL_LIBS)
-
 lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib533_LDADD = $(TESTUTIL_LIBS)
-
 lib536_SOURCES = lib536.c $(SUPPORTFILES)
-
 lib537_SOURCES = lib537.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE)
-lib537_LDADD = $(TESTUTIL_LIBS)
-
 lib539_SOURCES = lib539.c $(SUPPORTFILES)
-
 lib540_SOURCES = lib540.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib540_LDADD = $(TESTUTIL_LIBS)
-
 lib541_SOURCES = lib541.c $(SUPPORTFILES) $(MULTIBYTE)
-
 lib542_SOURCES = lib542.c $(SUPPORTFILES)
-
 lib543_SOURCES = lib543.c $(SUPPORTFILES)
-
 lib544_SOURCES = lib544.c $(SUPPORTFILES)
-
 lib547_SOURCES = lib547.c $(SUPPORTFILES)
-
 lib549_SOURCES = lib549.c $(SUPPORTFILES)
-
 lib552_SOURCES = lib552.c $(SUPPORTFILES) $(WARNLESS)
-
 lib553_SOURCES = lib553.c $(SUPPORTFILES)
-
 lib554_SOURCES = lib554.c $(SUPPORTFILES)
-
 lib555_SOURCES = lib555.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib555_LDADD = $(TESTUTIL_LIBS)
-
 lib556_SOURCES = lib556.c $(SUPPORTFILES) $(WARNLESS)
-
 lib557_SOURCES = lib557.c $(SUPPORTFILES)
-
 lib558_SOURCES = lib558.c $(SUPPORTFILES)
-
 lib559_SOURCES = lib559.c $(SUPPORTFILES)
-
 lib560_SOURCES = lib560.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib560_LDADD = $(TESTUTIL_LIBS)
-
 lib562_SOURCES = lib562.c $(SUPPORTFILES)
-
 lib564_SOURCES = lib564.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib564_LDADD = $(TESTUTIL_LIBS)
-
 lib566_SOURCES = lib566.c $(SUPPORTFILES) $(MULTIBYTE)
-
 lib567_SOURCES = lib567.c $(SUPPORTFILES)
-
 lib568_SOURCES = lib568.c $(SUPPORTFILES) $(TESTUTIL) $(MULTIBYTE)
-lib568_LDADD = $(TESTUTIL_LIBS)
-
 lib569_SOURCES = lib569.c $(SUPPORTFILES) $(TESTUTIL) $(MULTIBYTE)
-lib569_LDADD = $(TESTUTIL_LIBS)
-
 lib570_SOURCES = lib570.c $(SUPPORTFILES) $(TESTUTIL)
-lib570_LDADD = $(TESTUTIL_LIBS)
-
 lib571_SOURCES = lib571.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE)
-lib571_LDADD = $(TESTUTIL_LIBS)
-
 lib572_SOURCES = lib572.c $(SUPPORTFILES) $(TESTUTIL) $(MULTIBYTE)
-lib572_LDADD = $(TESTUTIL_LIBS)
-
 lib573_SOURCES = lib573.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(TSTTRACE)
-lib573_LDADD = $(TESTUTIL_LIBS)
-
 lib574_SOURCES = lib574.c $(SUPPORTFILES)
-
 lib575_SOURCES = lib575.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib575_LDADD = $(TESTUTIL_LIBS)
-
 lib576_SOURCES = lib576.c $(SUPPORTFILES)
-
 lib578_SOURCES = lib578.c $(SUPPORTFILES) $(MULTIBYTE)
-
 lib579_SOURCES = lib579.c $(SUPPORTFILES) $(MULTIBYTE)
-
 lib582_SOURCES = lib582.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE)
-lib582_LDADD = $(TESTUTIL_LIBS)
-
 lib583_SOURCES = lib583.c $(SUPPORTFILES)
-
 lib586_SOURCES = lib586.c $(SUPPORTFILES)
-
 lib589_SOURCES = lib589.c $(SUPPORTFILES)
-
 lib590_SOURCES = lib590.c $(SUPPORTFILES)
-
 lib591_SOURCES = lib591.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE)
-lib591_LDADD = $(TESTUTIL_LIBS)
-
 lib597_SOURCES = lib597.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib597_LDADD = $(TESTUTIL_LIBS)
-
 lib598_SOURCES = lib598.c $(SUPPORTFILES)
-
 lib599_SOURCES = lib599.c $(SUPPORTFILES) $(MULTIBYTE)
-
 lib643_SOURCES = lib643.c $(SUPPORTFILES)
-
 lib650_SOURCES = lib650.c $(SUPPORTFILES)
-
 lib651_SOURCES = lib651.c $(SUPPORTFILES)
-
 lib652_SOURCES = lib652.c $(SUPPORTFILES)
-
 lib653_SOURCES = lib653.c $(SUPPORTFILES)
-
 lib654_SOURCES = lib654.c $(SUPPORTFILES)
-
 lib655_SOURCES = lib655.c $(SUPPORTFILES)
-
 lib658_SOURCES = lib658.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib658_LDADD = $(TESTUTIL_LIBS)
-
 lib659_SOURCES = lib659.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib659_LDADD = $(TESTUTIL_LIBS)
-
 lib661_SOURCES = lib661.c $(SUPPORTFILES)
-
 lib666_SOURCES = lib666.c $(SUPPORTFILES)
-
 lib667_SOURCES = lib667.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib667_LDADD = $(TESTUTIL_LIBS)
-
 lib668_SOURCES = lib668.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib668_LDADD = $(TESTUTIL_LIBS)
-
 lib670_SOURCES = lib670.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib670_LDADD = $(TESTUTIL_LIBS)
-
 lib674_SOURCES = lib674.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib674_LDADD = $(TESTUTIL_LIBS)
-
 lib676_SOURCES = lib676.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib676_LDADD = $(TESTUTIL_LIBS)
-
 lib677_SOURCES = lib677.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE)
-lib677_LDADD = $(TESTUTIL_LIBS)
-
 lib678_SOURCES = lib678.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) $(MULTIBYTE)
-lib678_LDADD = $(TESTUTIL_LIBS)
-
 lib694_SOURCES = lib694.c $(SUPPORTFILES)
-
 lib695_SOURCES = lib695.c $(SUPPORTFILES)
-
 lib751_SOURCES = lib751.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib751_LDADD = $(TESTUTIL_LIBS)
-
 lib1301_SOURCES = lib1301.c $(SUPPORTFILES) $(TESTUTIL)
-lib1301_LDADD = $(TESTUTIL_LIBS)
-
 lib1308_SOURCES = lib1308.c $(SUPPORTFILES)
-lib1308_LDADD = $(TESTUTIL_LIBS)
-
 lib1485_SOURCES = lib1485.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1485_LDADD = $(TESTUTIL_LIBS)
-
 lib1500_SOURCES = lib1500.c $(SUPPORTFILES) $(TESTUTIL)
-lib1500_LDADD = $(TESTUTIL_LIBS)
-
 lib1501_SOURCES = lib1501.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1501_LDADD = $(TESTUTIL_LIBS)
-
 lib1502_SOURCES = lib1502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1502_LDADD = $(TESTUTIL_LIBS)
-
 lib1506_SOURCES = lib1506.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1506_LDADD = $(TESTUTIL_LIBS)
-
 lib1156_SOURCES = lib1156.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1156_LDADD = $(TESTUTIL_LIBS)
-
 lib1507_SOURCES = lib1507.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1507_LDADD = $(TESTUTIL_LIBS)
-
 lib1508_SOURCES = lib1508.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1508_LDADD = $(TESTUTIL_LIBS)
-
 lib1509_SOURCES = lib1509.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1509_LDADD = $(TESTUTIL_LIBS)
-
 lib1510_SOURCES = lib1510.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1510_LDADD = $(TESTUTIL_LIBS)
-
 lib1511_SOURCES = lib1511.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1511_LDADD = $(TESTUTIL_LIBS)
-
 lib1512_SOURCES = lib1512.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1512_LDADD = $(TESTUTIL_LIBS)
-
 lib1513_SOURCES = lib1513.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1513_LDADD = $(TESTUTIL_LIBS)
-
 lib1514_SOURCES = lib1514.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1514_LDADD = $(TESTUTIL_LIBS)
-
 lib1515_SOURCES = lib1515.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(WARNLESS)
-lib1515_LDADD = $(TESTUTIL_LIBS)
-
 lib1517_SOURCES = lib1517.c $(SUPPORTFILES)
-
 lib1518_SOURCES = lib1518.c $(SUPPORTFILES)
-
 lib1520_SOURCES = lib1520.c $(SUPPORTFILES)
-
 nodist_lib1521_SOURCES = lib1521.c $(SUPPORTFILES)
 lib1521_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)
-
 lib1522_SOURCES = lib1522.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE)
-lib1522_LDADD = $(TESTUTIL_LIBS)
-
 lib1523_SOURCES = lib1523.c $(SUPPORTFILES)
-
 lib1525_SOURCES = lib1525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1525_LDADD = $(TESTUTIL_LIBS)
-
 lib1526_SOURCES = lib1526.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1526_LDADD = $(TESTUTIL_LIBS)
-
 lib1527_SOURCES = lib1527.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1527_LDADD = $(TESTUTIL_LIBS)
-
 lib1528_SOURCES = lib1528.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1528_LDADD = $(TESTUTIL_LIBS)
-
 lib1529_SOURCES = lib1529.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1529_LDADD = $(TESTUTIL_LIBS)
-
 lib1530_SOURCES = lib1530.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1530_LDADD = $(TESTUTIL_LIBS)
-
 lib1531_SOURCES = lib1531.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1531_LDADD = $(TESTUTIL_LIBS)
-
 lib1532_SOURCES = lib1532.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1532_LDADD = $(TESTUTIL_LIBS)
-
 lib1533_SOURCES = lib1533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1533_LDADD = $(TESTUTIL_LIBS)
-
 lib1534_SOURCES = lib1534.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1534_LDADD = $(TESTUTIL_LIBS)
-
 lib1535_SOURCES = lib1535.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1535_LDADD = $(TESTUTIL_LIBS)
-
 lib1536_SOURCES = lib1536.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1536_LDADD = $(TESTUTIL_LIBS)
-
 lib1537_SOURCES = lib1537.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1537_LDADD = $(TESTUTIL_LIBS)
-
 lib1538_SOURCES = lib1538.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1538_LDADD = $(TESTUTIL_LIBS)
-
 lib1540_SOURCES = lib1540.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(WARNLESS)
-lib1540_LDADD = $(TESTUTIL_LIBS)
-
 lib1541_SOURCES = lib1541.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1541_LDADD = $(TESTUTIL_LIBS)
-
 lib1542_SOURCES = lib1542.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(WARNLESS)
-lib1542_LDADD = $(TESTUTIL_LIBS)
-
 lib1545_SOURCES = lib1545.c $(SUPPORTFILES)
-
 lib1550_SOURCES = lib1550.c $(SUPPORTFILES)
-
 lib1551_SOURCES = lib1551.c $(SUPPORTFILES)
-
 lib1552_SOURCES = lib1552.c $(SUPPORTFILES) $(TESTUTIL)
-lib1552_LDADD = $(TESTUTIL_LIBS)
-
 lib1553_SOURCES = lib1553.c $(SUPPORTFILES) $(TSTTRACE) $(TESTUTIL)
-lib1553_LDADD = $(TESTUTIL_LIBS)
-
 lib1554_SOURCES = lib1554.c $(SUPPORTFILES)
-
 lib1555_SOURCES = lib1555.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1555_LDADD = $(TESTUTIL_LIBS)
-
 lib1556_SOURCES = lib1556.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1556_LDADD = $(TESTUTIL_LIBS)
-
 lib1557_SOURCES = lib1557.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1557_LDADD = $(TESTUTIL_LIBS)
-
 lib1558_SOURCES = lib1558.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1558_LDADD = $(TESTUTIL_LIBS)
-
 lib1559_SOURCES = lib1559.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1559_LDADD = $(TESTUTIL_LIBS)
-
 lib1560_SOURCES = lib1560.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1560_LDADD = $(TESTUTIL_LIBS)
-
 lib1564_SOURCES = lib1564.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1564_LDADD = $(TESTUTIL_LIBS)
-
 lib1565_SOURCES = lib1565.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1565_LDADD = $(TESTUTIL_LIBS)
-
 lib1567_SOURCES = lib1567.c $(SUPPORTFILES)
-
 lib1568_SOURCES = lib1568.c $(SUPPORTFILES)
-
 lib1569_SOURCES = lib1569.c $(SUPPORTFILES)
-
 lib1571_SOURCES = lib1571.c $(SUPPORTFILES)
-
 lib1576_SOURCES = lib1576.c $(SUPPORTFILES)
-
 lib1591_SOURCES = lib1591.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1591_LDADD = $(TESTUTIL_LIBS)
-
 lib1592_SOURCES = lib1592.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1592_LDADD = $(TESTUTIL_LIBS)
-
 lib1593_SOURCES = lib1593.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1593_LDADD = $(TESTUTIL_LIBS)
-
 lib1594_SOURCES = lib1594.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1594_LDADD = $(TESTUTIL_LIBS)
-
 lib1597_SOURCES = lib1597.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1597_LDADD = $(TESTUTIL_LIBS)
-
 lib1598_SOURCES = lib1598.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1598_LDADD = $(TESTUTIL_LIBS)
-
 lib1662_SOURCES = lib1662.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1662_LDADD = $(TESTUTIL_LIBS)
-
 lib1900_SOURCES = lib1900.c $(SUPPORTFILES)
-
 lib1901_SOURCES = lib1901.c $(SUPPORTFILES)
-
 lib1903_SOURCES = lib1903.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1903_LDADD = $(TESTUTIL_LIBS)
-
 lib1905_SOURCES = lib1905.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1905_LDADD = $(TESTUTIL_LIBS)
-
 lib1906_SOURCES = lib1906.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1906_LDADD = $(TESTUTIL_LIBS)
-
 lib1907_SOURCES = lib1907.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1907_LDADD = $(TESTUTIL_LIBS)
-
 lib1908_SOURCES = lib1908.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1908_LDADD = $(TESTUTIL_LIBS)
-
 lib1910_SOURCES = lib1910.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1910_LDADD = $(TESTUTIL_LIBS)
-
 lib1911_SOURCES = lib1911.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1911_LDADD = $(TESTUTIL_LIBS)
-
 lib1912_SOURCES = lib1912.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1912_LDADD = $(TESTUTIL_LIBS)
-
 lib1913_SOURCES = lib1913.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1913_LDADD = $(TESTUTIL_LIBS)
-
 lib1915_SOURCES = lib1915.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(WARNLESS)
-lib1915_LDADD = $(TESTUTIL_LIBS)
-
 lib1916_SOURCES = lib1916.c $(SUPPORTFILES) $(WARNLESS)
-
 lib1918_SOURCES = lib1918.c $(SUPPORTFILES) $(WARNLESS)
-
 lib1919_SOURCES = lib1919.c $(SUPPORTFILES) $(WARNLESS)
-
 lib1933_SOURCES = lib1933.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1933_LDADD = $(TESTUTIL_LIBS)
-
 lib1934_SOURCES = lib1934.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1934_LDADD = $(TESTUTIL_LIBS)
-
 lib1935_SOURCES = lib1935.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1935_LDADD = $(TESTUTIL_LIBS)
-
 lib1936_SOURCES = lib1936.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1936_LDADD = $(TESTUTIL_LIBS)
-
 lib1937_SOURCES = lib1937.c $(SUPPORTFILES)
-lib1937_LDADD = $(TESTUTIL_LIBS)
-
 lib1938_SOURCES = lib1938.c $(SUPPORTFILES)
-lib1938_LDADD = $(TESTUTIL_LIBS)
-
 lib1939_SOURCES = lib1939.c $(SUPPORTFILES)
-lib1939_LDADD = $(TESTUTIL_LIBS)
-
 lib1940_SOURCES = lib1940.c $(SUPPORTFILES)
-lib1940_LDADD = $(TESTUTIL_LIBS)
-
 lib1945_SOURCES = lib1945.c $(SUPPORTFILES)
-lib1945_LDADD = $(TESTUTIL_LIBS)
-
 lib1947_SOURCES = lib1947.c $(SUPPORTFILES)
-lib1947_LDADD = $(TESTUTIL_LIBS)
-
 lib1948_SOURCES = lib1948.c $(SUPPORTFILES)
-lib1948_LDADD = $(TESTUTIL_LIBS)
-
 lib1955_SOURCES = lib1955.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1955_LDADD = $(TESTUTIL_LIBS)
-
 lib1956_SOURCES = lib1956.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1956_LDADD = $(TESTUTIL_LIBS)
-
 lib1957_SOURCES = lib1957.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1957_LDADD = $(TESTUTIL_LIBS)
-
 lib1958_SOURCES = lib1958.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1958_LDADD = $(TESTUTIL_LIBS)
-
 lib1959_SOURCES = lib1959.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1959_LDADD = $(TESTUTIL_LIBS)
-
 lib1960_SOURCES = lib1960.c $(SUPPORTFILES)
-lib1960_LDADD = $(TESTUTIL_LIBS)
-
 lib1964_SOURCES = lib1964.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1964_LDADD = $(TESTUTIL_LIBS)
-
 lib1970_SOURCES = lib1970.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1970_LDADD = $(TESTUTIL_LIBS)
-
 lib1971_SOURCES = lib1971.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1971_LDADD = $(TESTUTIL_LIBS)
-
 lib1972_SOURCES = lib1972.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1972_LDADD = $(TESTUTIL_LIBS)
-
 lib1973_SOURCES = lib1973.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1973_LDADD = $(TESTUTIL_LIBS)
-
 lib1974_SOURCES = lib1974.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1974_LDADD = $(TESTUTIL_LIBS)
-
 lib1975_SOURCES = lib1975.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1975_LDADD = $(TESTUTIL_LIBS)
-
 lib1977_SOURCES = lib1977.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1977_LDADD = $(TESTUTIL_LIBS)
-
 lib1978_SOURCES = lib1978.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1978_LDADD = $(TESTUTIL_LIBS)
-
 lib2301_SOURCES = lib2301.c $(SUPPORTFILES)
-lib2301_LDADD = $(TESTUTIL_LIBS)
-
 lib2302_SOURCES = lib2302.c $(SUPPORTFILES)
-lib2302_LDADD = $(TESTUTIL_LIBS)
-
 lib2304_SOURCES = lib2304.c $(SUPPORTFILES)
-lib2304_LDADD = $(TESTUTIL_LIBS)
-
 lib2306_SOURCES = lib2306.c $(SUPPORTFILES)
-lib2306_LDADD = $(TESTUTIL_LIBS)
-
 lib2308_SOURCES = lib2308.c $(SUPPORTFILES)
-lib2308_LDADD = $(TESTUTIL_LIBS)
-
 lib2309_SOURCES = lib2309.c $(SUPPORTFILES)
-lib2309_LDADD = $(TESTUTIL_LIBS)
-
 lib2402_SOURCES = lib2402.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib2402_LDADD = $(TESTUTIL_LIBS)
-
 lib2404_SOURCES = lib2404.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib2404_LDADD = $(TESTUTIL_LIBS)
-
 lib2405_SOURCES = lib2405.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib2405_LDADD = $(TESTUTIL_LIBS)
-
 lib2502_SOURCES = lib2502.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(WARNLESS)
-lib2502_LDADD = $(TESTUTIL_LIBS)
-
 lib2700_SOURCES = lib2700.c $(SUPPORTFILES) $(TESTUTIL) $(TSTTRACE) $(MULTIBYTE)
-lib2700_LDADD = $(TESTUTIL_LIBS)
-
 lib3010_SOURCES = lib3010.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib3010_LDADD = $(TESTUTIL_LIBS)
-
 lib3025_SOURCES = lib3025.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib3025_LDADD = $(TESTUTIL_LIBS)
-
 lib3026_SOURCES = lib3026.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib3026_LDADD = $(TESTUTIL_LIBS)
-
 lib3027_SOURCES = lib3027.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib3027_LDADD = $(TESTUTIL_LIBS)
-
 lib3100_SOURCES = lib3100.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib3100_LDADD = $(TESTUTIL_LIBS)
-
 lib3101_SOURCES = lib3101.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib3101_LDADD = $(TESTUTIL_LIBS)
-
 lib3102_SOURCES = lib3102.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib3102_LDADD = $(TESTUTIL_LIBS)
-
 lib3103_SOURCES = lib3103.c $(SUPPORTFILES)
-lib3103_LDADD = $(TESTUTIL_LIBS)
-
 lib3104_SOURCES = lib3104.c $(SUPPORTFILES)
-
 lib3105_SOURCES = lib3105.c $(SUPPORTFILES)
-
 lib3207_SOURCES = lib3207.c $(SUPPORTFILES) $(TESTUTIL) $(THREADS) $(WARNLESS) $(MULTIBYTE) $(MEMPTR)
-lib3207_LDADD = $(TESTUTIL_LIBS)
-
 lib3208_SOURCES = lib3208.c $(SUPPORTFILES) $(TESTUTIL)
-lib3208_LDADD = $(TESTUTIL_LIBS)
diff --git a/tests/libtest/lib1518.c b/tests/libtest/lib1518.c
index d317169ceba73b1b8d1788f285ab64b2881724a5..7d8f593382ad3d03d86d7b2613a4c2ff98c28bf1 100644 (file)
--- a/tests/libtest/lib1518.c
+++ b/tests/libtest/lib1518.c
@@ -97,7 +97,6 @@ test_cleanup:
   /* always cleanup */
   curl_easy_cleanup(curl);
   curl_global_cleanup();
-  if(testnum == 1543)
-    curl_url_cleanup(urlu);
+  curl_url_cleanup(urlu);
   return res;
 }
diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c
index 16f9a6e9b369a6725a42b42d27ac7a569d7414fc..eaf78411b1d7999072427ccfd7d04056ef9cf7f0 100644 (file)
--- a/tests/libtest/lib525.c
+++ b/tests/libtest/lib525.c
@@ -42,12 +42,7 @@ CURLcode test(char *URL)
   start_test_timing();
 
   if(!libtest_arg2) {
-    if(testnum == 529) {
-      curl_mfprintf(stderr, "Usage: lib529 [url] [uploadfile]\n");
-    }
-    else { /* testnum == 525 */
-      curl_mfprintf(stderr, "Usage: lib525 [url] [uploadfile]\n");
-    }
+    curl_mfprintf(stderr, "Usage: test [url] [uploadfile]\n");
     return TEST_ERR_USAGE;
   }
 
diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c
index 3b068488a55e47287d4f1c98d88b500cc7b7cb24..d8ce329467d1b2a972611ec61733b57a81d57a19 100644 (file)
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@@ -92,7 +92,6 @@ CURLcode test(char *URL)
     abort_on_test_timeout();
 
     if(!running) {
-
       if(testnum == 527) {
         /* NOTE: this code does not remove the handle from the multi handle
            here, which would be the nice, sane and documented way of working.
@@ -100,23 +99,21 @@ CURLcode test(char *URL)
         curl_easy_cleanup(curl[current]);
         curl[current] = NULL;
       }
-
       if(++current < NUM_HANDLES) {
         curl_mfprintf(stderr, "Advancing to URL %d\n", current);
-
         if(testnum == 532) {
-        /* first remove the only handle we use */
-        curl_multi_remove_handle(m, curl[0]);
-
-        /* make us reuse the same handle all the time, and try resetting
-           the handle first too */
-        curl_easy_reset(curl[0]);
-        easy_setopt(curl[0], CURLOPT_URL, URL);
-        /* go verbose */
-        easy_setopt(curl[0], CURLOPT_VERBOSE, 1L);
-
-        /* re-add it */
-        multi_add_handle(m, curl[0]);
+          /* first remove the only handle we use */
+          curl_multi_remove_handle(m, curl[0]);
+
+          /* make us reuse the same handle all the time, and try resetting
+             the handle first too */
+          curl_easy_reset(curl[0]);
+          easy_setopt(curl[0], CURLOPT_URL, URL);
+          /* go verbose */
+          easy_setopt(curl[0], CURLOPT_VERBOSE, 1L);
+
+          /* re-add it */
+          multi_add_handle(m, curl[0]);
         }
         else {
           multi_add_handle(m, curl[current]);
@@ -142,7 +139,7 @@ CURLcode test(char *URL)
 
 test_cleanup:
 
-  if(testnum == 526 || testnum == 528) {
+  if((testnum == 526) || (testnum == 528)) {
     /* proper cleanup sequence - type PB */
 
     for(i = 0; i < NUM_HANDLES; i++) {
@@ -164,8 +161,9 @@ test_cleanup:
 
     curl_multi_cleanup(m);
     curl_global_cleanup();
+
   }
-  else { /* testnum == 532 */
+  else if(testnum == 532) {
     /* undocumented cleanup sequence - type UB */
 
     for(i = 0; i < NUM_HANDLES; i++)
Mirror of https://github.com/curl/curl.git