aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2010-11-05 11:19:21 +0100
committerDaniel Stenberg <daniel@haxx.se>2010-11-05 11:26:26 +0100
commit1786950759a0429bde29822c3c879fdbf305f24d (patch)
tree2124485f7a3779976cdf4e8d8c0c90b685cc823a
parent87374a47c9d22521c8d31f1c4952db5fdb479903 (diff)
test: remove test 580
Test 580 is removed again for two reasons: 1) Some compilers aren't satisfied by just a data variable called 'test' when first.o wants a function called 'test'. The Solaris compiler says "ld: warning: symbol `test' has differing types:" while the AIX compiler downright rejects it. 2) Test case 1119 that was added after this test is way more complete and cover everything test 580 does and more without introducing the same problems.
-rw-r--r--tests/libtest/.gitignore2
-rw-r--r--tests/libtest/Makefile.am2
-rw-r--r--tests/libtest/Makefile.inc7
-rw-r--r--tests/libtest/mk580.pl18
4 files changed, 3 insertions, 26 deletions
diff --git a/tests/libtest/.gitignore b/tests/libtest/.gitignore
index 672fc9f5b..82560206e 100644
--- a/tests/libtest/.gitignore
+++ b/tests/libtest/.gitignore
@@ -1,3 +1,3 @@
chkhostname
lib5[0-9][0-9]
-lib580.c
+
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 36d225a6b..9c0d59507 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -51,7 +51,7 @@ INCLUDES = -I$(top_builddir)/include/curl \
endif
EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \
-test1022.pl mk580.pl Makefile.inc
+test1022.pl Makefile.inc
# Dependencies (may need to be overriden)
LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index ce7f4e6c5..a0f1c0ecb 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -12,7 +12,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \
lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \
lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 \
lib539 lib557 lib558 lib559 lib560 lib562 lib564 lib565 lib566 lib567 \
- lib568 lib569 lib570 lib571 lib572 lib573 chkhostname lib580
+ lib568 lib569 lib570 lib571 lib572 lib573 chkhostname
chkhostname_SOURCES = chkhostname.c $(top_srcdir)/lib/curl_gethostname.c
chkhostname_LDADD = @CURL_NETWORK_LIBS@
@@ -164,8 +164,3 @@ lib573_SOURCES = lib573.c $(SUPPORTFILES) $(TESTUTIL)
lib578_SOURCES = lib578.c $(SUPPORTFILES)
lib579_SOURCES = lib579.c $(SUPPORTFILES)
-
-lib580_SOURCES = lib580.c $(SUPPORTFILES)
-
-lib580.c: $(top_srcdir)/tests/libtest/mk580.pl $(top_srcdir)/docs/libcurl/symbols-in-versions
- $(PERL) $(top_srcdir)/tests/libtest/mk580.pl $(top_srcdir)/docs/libcurl/symbols-in-versions > $@
diff --git a/tests/libtest/mk580.pl b/tests/libtest/mk580.pl
deleted file mode 100644
index 8dc6d57b8..000000000
--- a/tests/libtest/mk580.pl
+++ /dev/null
@@ -1,18 +0,0 @@
-open(S, '<', $ARGV[0]);
-
-print <<EOF
-#include "curl/curl.h"
-
-int test[] = {
-EOF
- ;
-while(<S>) {
- my @a=split(/ +/);
- chomp $a[0];
- chomp $a[3];
- if($a[0] && !$a[3]) {
- printf("%s,\n", $a[0]);
- }
-}
-print "};\n";
-close(S);