lib: bump version info (soname). Adapt and reenable test 1135.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 176bf3342f1298fe47565d54dcf31d32b91262d7..6b48ab3663126a6848edde2baaefa3cb92596f78 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -76,9 +76,9 @@ if SONAME_BUMP
 #
 # This conditional soname bump SHOULD be removed at next "proper" bump.
 #
-VERSIONINFO=-version-info 9:0:4
+VERSIONINFO=-version-info 10:0:5
 else
-VERSIONINFO=-version-info 8:0:4
+VERSIONINFO=-version-info 9:0:5
 endif
 
 # This flag accepts an argument of the form current[:revision[:age]]. So,

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 27ea7747360de615262dd66430b5416b04cd26e4..11d54b4637777f411c2d771d7edc100c0b77b140 100644 (file)
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -18,6 +18,3 @@
 1510
 # Pipelining test that is causing false positives a little too often
 1903
-# Entry point order should currently not be checked: mime API requires a
-# SONAME change.
-1135

diff --git a/tests/data/test1135 b/tests/data/test1135
index fb0a4e0c1dfdd339b9f77a5f6a398ded67df3286..2bad500d8f1e18d84a17e07789d8ec76c8408d5c 100644 (file)
--- a/tests/data/test1135
+++ b/tests/data/test1135
@@ -30,6 +30,18 @@ Verify CURL_EXTERN order
 <stdout>
 CURL_EXTERN int (curl_strequal)(const char *s1, const char *s2);
 CURL_EXTERN int (curl_strnequal)(const char *s1, const char *s2, size_t n);
+CURL_EXTERN curl_mime *curl_mime_init(CURL *easy);
+CURL_EXTERN void curl_mime_free(curl_mime *mime);
+CURL_EXTERN curl_mimepart *curl_mime_addpart(curl_mime *mime);
+CURL_EXTERN CURLcode curl_mime_name(curl_mimepart *part,
+CURL_EXTERN CURLcode curl_mime_filename(curl_mimepart *part,
+CURL_EXTERN CURLcode curl_mime_type(curl_mimepart *part, const char *mimetype);
+CURL_EXTERN CURLcode curl_mime_encoder(struct Curl_mimepart *part,
+CURL_EXTERN CURLcode curl_mime_data(curl_mimepart *part,
+CURL_EXTERN CURLcode curl_mime_filedata(curl_mimepart *part,
+CURL_EXTERN CURLcode curl_mime_data_cb(curl_mimepart *part,
+CURL_EXTERN CURLcode curl_mime_subparts(curl_mimepart *part,
+CURL_EXTERN CURLcode curl_mime_headers(curl_mimepart *part,
 CURL_EXTERN CURLFORMcode curl_formadd(struct curl_httppost **httppost,
 CURL_EXTERN int curl_formget(struct curl_httppost *form, void *arg,
 CURL_EXTERN void curl_formfree(struct curl_httppost *form);
@@ -43,6 +55,7 @@ CURL_EXTERN void curl_free(void *p);
 CURL_EXTERN CURLcode curl_global_init(long flags);
 CURL_EXTERN CURLcode curl_global_init_mem(long flags,
 CURL_EXTERN void curl_global_cleanup(void);
+CURL_EXTERN CURLsslset curl_global_sslset(curl_sslbackend id, const char *name,
 CURL_EXTERN struct curl_slist *curl_slist_append(struct curl_slist *,
 CURL_EXTERN void curl_slist_free_all(struct curl_slist *);
 CURL_EXTERN time_t curl_getdate(const char *p, const time_t *unused);
@@ -89,7 +102,6 @@ CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
 CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
 CURL_EXTERN char *curl_pushheader_bynum(struct curl_pushheaders *h,
 CURL_EXTERN char *curl_pushheader_byname(struct curl_pushheaders *h,
-CURL_EXTERN CURLsslset curl_global_sslset(curl_sslbackend id, const char *name,
 </stdout>
 </verify>