aboutsummaryrefslogtreecommitdiff
path: root/tests/libtest
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2011-03-04 14:32:58 -0800
committerDan Fandrich <dan@coneharvesters.com>2011-03-04 14:32:58 -0800
commitfb199cd29d0ce275f9b9b28b1ebf6af3e0887950 (patch)
treeaa3d156eb9c2fbfb4347ef438f20bbb6616b41af /tests/libtest
parenta8aab6e7d45fe1e325100c6c5938a4258327dd08 (diff)
Converted tests 558 & 559 to use the unit test framework as 1305
Test 558 was just a subset of 559 which is something that can be easily added later.
Diffstat (limited to 'tests/libtest')
-rw-r--r--tests/libtest/CMakeLists.txt8
-rw-r--r--tests/libtest/Makefile.inc8
-rw-r--r--tests/libtest/lib558.c188
3 files changed, 2 insertions, 202 deletions
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 653e5315d..896686bd8 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -65,8 +65,7 @@ endforeach()
# lib547
# #lib548
# lib549 lib552 lib553 lib554 lib555 lib556
-# lib539 lib557 lib558
-# #lib559
+# lib539 lib557
# lib560
# )
@@ -120,8 +119,3 @@ endforeach()
# SET(SOURCE "lib547.c" ${SUPPORTFILES})
# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
# SETUP_TEST(${TEST_NAME} ${SOURCE})
-
-# SET(TEST_NAME lib559)
-# SET(SOURCE "lib558.c" ${SUPPORTFILES})
-# ADD_TESTUTIL_IF_NECESSARY(${TEST_NAME})
-# SETUP_TEST(${TEST_NAME} ${SOURCE})
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 2354ecc60..322feeac4 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -11,7 +11,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \
lib574 lib575 lib576 lib577 lib578 lib579 \
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 \
+ lib539 lib557 lib560 lib562 lib564 lib565 lib566 lib567 \
lib568 lib569 lib570 lib571 lib572 lib573 chkhostname
chkhostname_SOURCES = chkhostname.c $(top_srcdir)/lib/curl_gethostname.c
@@ -122,12 +122,6 @@ lib556_SOURCES = lib556.c $(SUPPORTFILES)
lib557_SOURCES = lib557.c $(SUPPORTFILES)
-lib558_SOURCES = lib558.c $(SUPPORTFILES)
-lib558_CFLAGS = -DLIB558
-
-lib559_SOURCES = lib558.c $(SUPPORTFILES)
-lib559_CFLAGS = -DLIB559
-
lib560_SOURCES = lib560.c $(SUPPORTFILES)
lib574_SOURCES = lib574.c $(SUPPORTFILES)
diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c
deleted file mode 100644
index 56f2a2612..000000000
--- a/tests/libtest/lib558.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*****************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
- */
-
-#include "test.h"
-
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-
-#define ENABLE_CURLX_PRINTF
-#include "curlx.h"
-
-#include "hash.h"
-#include "hostip.h"
-
-#include "curl_memory.h"
-#include "memdebug.h"
-
-/* This source file is used for test # 558 and 559 */
-
-/*
- * This hacky test bypasses the library external API,
- * using internal only libcurl functions. So don't be
- * surprised if we cannot run it when the library has
- * been built with hidden symbols, exporting only the
- * ones in the public API.
- */
-
-#if defined(CURL_HIDDEN_SYMBOLS)
-# define SKIP_TEST 1
-#elif defined(WIN32) && !defined(CURL_STATICLIB)
-# define SKIP_TEST 1
-#else
-# undef SKIP_TEST
-#endif
-
-
-#if !defined(SKIP_TEST)
-
-#ifdef LIB559
-static Curl_addrinfo *fake_ai(void)
-{
- Curl_addrinfo *ai;
- int ss_size;
-
- ss_size = sizeof (struct sockaddr_in);
-
- if((ai = calloc(1, sizeof(Curl_addrinfo))) == NULL)
- return NULL;
-
- if((ai->ai_canonname = strdup("dummy")) == NULL) {
- free(ai);
- return NULL;
- }
-
- if((ai->ai_addr = calloc(1, ss_size)) == NULL) {
- free(ai->ai_canonname);
- free(ai);
- return NULL;
- }
-
- ai->ai_family = AF_INET;
- ai->ai_addrlen = ss_size;
-
- return ai;
-}
-#endif /* LIB559 */
-
-
-int test(char *URL)
-{
- CURL *easyh = NULL;
- struct curl_hash *hp = NULL;
- int result = 0;
-
- if(!strcmp(URL, "check")) {
- /* test harness script verifying if this test can run */
- return 0; /* sure, run this! */
- }
-
- easyh = curl_easy_init();
- if(!easyh) {
- fprintf(stdout, "easy handle init failed\n");
- result = TEST_ERR_MAJOR_BAD;
- goto cleanup;
- }
- fprintf(stdout, "easy handle init OK\n");
-
- fprintf(stdout, "creating hash...\n");
- hp = Curl_mk_dnscache();
- if(!hp) {
- fprintf(stdout, "hash creation failed\n");
- result = TEST_ERR_MAJOR_BAD;
- goto cleanup;
- }
- fprintf(stdout, "hash creation OK\n");
-
- /**/
-#ifdef LIB559
- {
- char *data_key;
- struct Curl_dns_entry *data_node;
- struct Curl_dns_entry *nodep;
- size_t key_len;
-
- data_key = aprintf("%s:%d", "dummy", 0);
- if(!data_key) {
- fprintf(stdout, "data key creation failed\n");
- result = TEST_ERR_MAJOR_BAD;
- goto cleanup;
- }
- key_len = strlen(data_key);
-
- data_node = calloc(1, sizeof(struct Curl_dns_entry));
- if(!data_node) {
- fprintf(stdout, "data node creation failed\n");
- result = TEST_ERR_MAJOR_BAD;
- free(data_key);
- goto cleanup;
- }
-
- data_node->addr = fake_ai();
- if(!data_node->addr) {
- fprintf(stdout, "actual data creation failed\n");
- result = TEST_ERR_MAJOR_BAD;
- free(data_node);
- free(data_key);
- goto cleanup;
- }
-
- nodep = Curl_hash_add(hp, data_key, key_len+1, (void *)data_node);
- if(!nodep) {
- fprintf(stdout, "insertion into hash failed\n");
- result = TEST_ERR_MAJOR_BAD;
- Curl_freeaddrinfo(data_node->addr);
- free(data_node);
- free(data_key);
- goto cleanup;
- }
-
- free(data_key);
- }
-#endif /* LIB559 */
- /**/
-
-cleanup:
-
- fprintf(stdout, "destroying hash...\n");
- Curl_hash_destroy(hp);
- fprintf(stdout, "hash destruction OK\n");
-
- fprintf(stdout, "destroying easy handle...\n");
- curl_easy_cleanup(easyh);
- fprintf(stdout, "easy handle destruction OK\n");
-
- curl_global_cleanup();
-
- return result;
-}
-
-
-#else /* !defined(SKIP_TEST) */
-
-
-int test(char *URL)
-{
- (void)URL;
- fprintf(stdout, "libcurl built with hidden symbols");
- return 1; /* skip test */
-}
-
-
-#endif /* !defined(SKIP_TEST) */