romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-27 01:57:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

include: curl/system.h is a run-time version of curlbuild.h

Browse source 
system.h is aimed to replace curlbuild.h at a later point in time when
we feel confident system.h works sufficiently well.

curl/system.h is currently used in parallel with curl/curlbuild.h

curl/system.h determines a data sizes, data types and include file
status based on available preprocessor defines instead of getting
generated at build-time. This, in order to avoid relying on a build-time
generated file that makes it complicated to do 32 and 64 bit bields from
the same installed set of headers.

Test 1541 verifies that system.h comes to the same conclusion that
curlbuild.h offers.

Closes #1373
This commit is contained in:
Daniel Stenberg 2017-03-29 14:38:56 +02:00
parent 5f1163517e
commit 9506d01ee5
9 changed files with 599 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/data/Makefile.inc
View file

@ -163,7 +163,7 @@ test1520 \
\
test1525 test1526 test1527 test1528 test1529 test1530 test1531 test1532 \
test1533 test1534 test1535 test1536 \
test1540 \
test1540 test1541 \
\
test1600 test1601 test1602 test1603 test1604 test1605 \
\

22
tests/data/test1541 Normal file
View file

@ -0,0 +1,22 @@
<testcase>
<info>
<keywords>
typecheck
</keywords>
</info>
#
# Client-side
<client>
<server>
none
</server>
<name>
verify curl/system.h detection
</name>
<tool>
lib1541
</tool>
</client>
</testcase>

6
tests/libtest/Makefile.inc
View file

@ -25,7 +25,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
lib1520 \
lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 lib1532 lib1533 \
lib1534 lib1535 lib1536 \
lib1540 \
lib1540 lib1541 \
lib1900 \
lib2033
@ -417,6 +417,10 @@ lib1540_SOURCES = lib1540.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1540_LDADD = $(TESTUTIL_LIBS)
lib1540_CPPFLAGS = $(AM_CPPFLAGS)
lib1541_SOURCES = lib1541.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1541_LDADD = $(TESTUTIL_LIBS)
lib1541_CPPFLAGS = $(AM_CPPFLAGS)
lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1900_LDADD = $(TESTUTIL_LIBS)
lib1900_CPPFLAGS = $(AM_CPPFLAGS)

109
tests/libtest/lib1541.c Normal file
View file

@ -0,0 +1,109 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
***************************************************************************/
#include "test.h"
#include "testutil.h"
#include "warnless.h"
#include "memdebug.h"
#define XSTR(x) #x
#define STRING(y) XSTR(y)
int test(char *URL)
{
char detect[512];
char syst[512];
const char *types_h = "No";
const char *socket_h = "No";
const char *stypes_h = "No";
const char *ssocket_h = "No";
(void)(URL);
#ifdef CURL_PULL_SYS_TYPES_H
types_h = "Yes";
#endif
#ifdef CURL_PULL_SYS_SOCKET_H
socket_h = "Yes";
#endif
snprintf(detect, sizeof(detect),
"CURL_TYPEOF_CURL_OFF_T: %s\n"
"CURL_FORMAT_CURL_OFF_T: %s\n"
"CURL_FORMAT_CURL_OFF_TU: %s\n"
"CURL_SUFFIX_CURL_OFF_T: %s\n"
"CURL_SUFFIX_CURL_OFF_TU: %s\n"
"CURL_SIZEOF_CURL_OFF_T: %d\n"
"CURL_SIZEOF_LONG: %d\n"
"CURL_TYPEOF_CURL_SOCKLEN_T: %s\n"
"CURL_PULL_SYS_TYPES_H: %s\n"
"CURL_PULL_SYS_SOCKET_H: %s\n"
, STRING(CURL_TYPEOF_CURL_OFF_T)
, CURL_FORMAT_CURL_OFF_T
, CURL_FORMAT_CURL_OFF_TU
, STRING(CURL_SUFFIX_CURL_OFF_T)
, STRING(CURL_SUFFIX_CURL_OFF_TU)
, CURL_SIZEOF_CURL_OFF_T
, CURL_SIZEOF_LONG
, STRING(CURL_TYPEOF_CURL_SOCKLEN_T)
, types_h
, socket_h);
#ifdef CURLSYS_PULL_SYS_TYPES_H
stypes_h = "Yes";
#endif
#ifdef CURLSYS_PULL_SYS_SOCKET_H
ssocket_h = "Yes";
#endif
snprintf(syst, sizeof(syst),
"CURL_TYPEOF_CURL_OFF_T: %s\n"
"CURL_FORMAT_CURL_OFF_T: %s\n"
"CURL_FORMAT_CURL_OFF_TU: %s\n"
"CURL_SUFFIX_CURL_OFF_T: %s\n"
"CURL_SUFFIX_CURL_OFF_TU: %s\n"
"CURL_SIZEOF_CURL_OFF_T: %d\n"
"CURL_SIZEOF_LONG: %d\n"
"CURL_TYPEOF_CURL_SOCKLEN_T: %s\n"
"CURL_PULL_SYS_TYPES_H: %s\n"
"CURL_PULL_SYS_SOCKET_H: %s\n"
, STRING(CURLSYS_TYPEOF_CURL_OFF_T)
, CURLSYS_FORMAT_CURL_OFF_T
, CURLSYS_FORMAT_CURL_OFF_TU
, STRING(CURLSYS_SUFFIX_CURL_OFF_T)
, STRING(CURLSYS_SUFFIX_CURL_OFF_TU)
, CURLSYS_SIZEOF_CURL_OFF_T
, CURLSYS_SIZEOF_LONG
, STRING(CURLSYS_TYPEOF_CURL_SOCKLEN_T)
, stypes_h
, ssocket_h);
if(strcmp(detect, syst)) {
printf("===> Type detection failed <====\n");
printf("[Detected]\n%s", detect);
printf("[System]\n%s", syst);
return 1; /* FAIL! */
}
return 0;
}