configure: enable inline tests to refer to PWD
... and use that to inline the xlocalescanprint test. Change-Id: I0973133d7f9ecc9a38b70dc4b83df174a35b2b1f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen
parent
73b8769730
commit
98689cd2f9
@ -1,43 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2016 The Qt Company Ltd.
|
|
||||||
** Contact: https://www.qt.io/licensing/
|
|
||||||
**
|
|
||||||
** This file is part of the config.tests of the Qt Toolkit.
|
|
||||||
**
|
|
||||||
** $QT_BEGIN_LICENSE:LGPL$
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
||||||
** information use the contact form at https://www.qt.io/contact-us.
|
|
||||||
**
|
|
||||||
** GNU Lesser General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
||||||
** General Public License version 3 as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
|
||||||
** packaging of this file. Please review the following information to
|
|
||||||
** ensure the GNU Lesser General Public License version 3 requirements
|
|
||||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 2.0 or (at your option) the GNU General
|
|
||||||
** Public license version 3 or any later version approved by the KDE Free
|
|
||||||
** Qt Foundation. The licenses are as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
|
||||||
** included in the packaging of this file. Please review the following
|
|
||||||
** information to ensure the GNU General Public License requirements will
|
|
||||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
|
||||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
|
||||||
**
|
|
||||||
** $QT_END_LICENSE$
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef QGLOBAL_H
|
|
||||||
#define QGLOBAL_H
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2016 The Qt Company Ltd.
|
|
||||||
** Contact: https://www.qt.io/licensing/
|
|
||||||
**
|
|
||||||
** This file is part of the config.tests of the Qt Toolkit.
|
|
||||||
**
|
|
||||||
** $QT_BEGIN_LICENSE:LGPL$
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
||||||
** information use the contact form at https://www.qt.io/contact-us.
|
|
||||||
**
|
|
||||||
** GNU Lesser General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
||||||
** General Public License version 3 as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
|
||||||
** packaging of this file. Please review the following information to
|
|
||||||
** ensure the GNU Lesser General Public License version 3 requirements
|
|
||||||
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 2.0 or (at your option) the GNU General
|
|
||||||
** Public license version 3 or any later version approved by the KDE Free
|
|
||||||
** Qt Foundation. The licenses are as published by the Free Software
|
|
||||||
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
|
||||||
** included in the packaging of this file. Please review the following
|
|
||||||
** information to ensure the GNU General Public License requirements will
|
|
||||||
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
|
||||||
** https://www.gnu.org/licenses/gpl-3.0.html.
|
|
||||||
**
|
|
||||||
** $QT_END_LICENSE$
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#define QT_BEGIN_NAMESPACE
|
|
||||||
#define QT_END_NAMESPACE
|
|
||||||
|
|
||||||
#ifdef _MSVC_VER
|
|
||||||
#define Q_CC_MSVC _MSVC_VER
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define QT_NO_DOUBLECONVERSION
|
|
||||||
|
|
||||||
#include "../../../src/corelib/tools/qdoublescanprint_p.h"
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
#ifdef _MSVC_VER
|
|
||||||
_locale_t invalidLocale = NULL;
|
|
||||||
#else
|
|
||||||
locale_t invalidLocale = NULL;
|
|
||||||
#endif
|
|
||||||
double a = 3.4;
|
|
||||||
qDoubleSnprintf(argv[0], 1, invalidLocale, "invalid format", a);
|
|
||||||
qDoubleSscanf(argv[0], invalidLocale, "invalid format", &a, &argc);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -1 +0,0 @@
|
|||||||
SOURCES = xlocalescanprint.cpp
|
|
||||||
@ -1178,9 +1178,10 @@ defineTest(qtConfPrepareCompileTestSource) {
|
|||||||
# Create stub .pro file
|
# Create stub .pro file
|
||||||
contents = "SOURCES = main.$$suffix"
|
contents = "SOURCES = main.$$suffix"
|
||||||
# Custom project code
|
# Custom project code
|
||||||
|
pwd = $$val_escape($${currentConfig}.dir)
|
||||||
for (test, tests): \
|
for (test, tests): \
|
||||||
for (ent, $$qtConfScalarOrList($${test}.test.qmake)): \
|
for (ent, $$qtConfScalarOrList($${test}.test.qmake)): \
|
||||||
contents += $$ent
|
contents += $$replace(ent, "@PWD@", $$pwd)
|
||||||
write_file($$test_dir/$$basename(test_dir).pro, contents)|error()
|
write_file($$test_dir/$$basename(test_dir).pro, contents)|error()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -467,7 +467,38 @@
|
|||||||
"xlocalescanprint": {
|
"xlocalescanprint": {
|
||||||
"label": "xlocale.h (or equivalents)",
|
"label": "xlocale.h (or equivalents)",
|
||||||
"type": "compile",
|
"type": "compile",
|
||||||
"test": "xlocalescanprint"
|
"test": {
|
||||||
|
"files": {
|
||||||
|
"qglobal.h": [
|
||||||
|
"#ifndef QGLOBAL_H",
|
||||||
|
"#define QGLOBAL_H",
|
||||||
|
"#endif"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"tail": [
|
||||||
|
"#define QT_BEGIN_NAMESPACE",
|
||||||
|
"#define QT_END_NAMESPACE",
|
||||||
|
"",
|
||||||
|
"#ifdef _MSVC_VER",
|
||||||
|
"#define Q_CC_MSVC _MSVC_VER",
|
||||||
|
"#endif",
|
||||||
|
"",
|
||||||
|
"#define QT_NO_DOUBLECONVERSION",
|
||||||
|
"",
|
||||||
|
"#include QDSP_P_H"
|
||||||
|
],
|
||||||
|
"main": [
|
||||||
|
"#ifdef _MSVC_VER",
|
||||||
|
"_locale_t invalidLocale = NULL;",
|
||||||
|
"#else",
|
||||||
|
"locale_t invalidLocale = NULL;",
|
||||||
|
"#endif",
|
||||||
|
"double a = 3.4;",
|
||||||
|
"qDoubleSnprintf(argv[0], 1, invalidLocale, \"invalid format\", a);",
|
||||||
|
"qDoubleSscanf(argv[0], invalidLocale, \"invalid format\", &a, &argc);"
|
||||||
|
],
|
||||||
|
"qmake": "DEFINES += QDSP_P_H=$$shell_quote(\\\"@PWD@/tools/qdoublescanprint_p.h\\\")"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user