diff options
| author | Patrick Monnerat <patrick@monnerat.net> | 2017-09-04 00:35:53 +0100 |
|---|---|---|
| committer | Patrick Monnerat <patrick@monnerat.net> | 2017-09-04 00:35:53 +0100 |
| commit | 1ab9e9b50a5f9fd675d27c35944c49af8df2c10a (patch) | |
| tree | 8bca65362ba72d317afe08109bac4f45d288fada | |
| parent | 0d4a6355a84b71967a5ecdd22ef7823af614322f (diff) | |
| download | curl-1ab9e9b50a5f9fd675d27c35944c49af8df2c10a.tar.gz | |
lib: bump version info (soname). Adapt and reenable test 1135.
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/data/DISABLED | 3 | ||||
| -rw-r--r-- | tests/data/test1135 | 14 |
3 files changed, 15 insertions, 6 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 176bf3342..6b48ab366 100644 --- 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 27ea77473..11d54b463 100644 --- 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 fb0a4e0c1..2bad500d8 100644 --- 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> |