Browse Source

Merge #9366: Fix: OSX QT compile: use built-in swap if available, or defer

815f414 Uses built-in byte swap if available (Apple) and if bswap_XX is undefined. (Karl-Johan Alm)
0.14
Wladimir J. van der Laan 8 years ago
parent
commit
79da3979b7
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 3
      src/Makefile.qttest.include
  2. 1
      src/Makefile.test.include
  3. 19
      src/compat/byteswap.h
  4. 23
      src/qt/test/compattests.cpp
  5. 19
      src/qt/test/compattests.h
  6. 4
      src/qt/test/test_main.cpp
  7. 26
      src/test/bswap_tests.cpp

3
src/Makefile.qttest.include

@ -6,6 +6,7 @@ bin_PROGRAMS += qt/test/test_bitcoin-qt @@ -6,6 +6,7 @@ bin_PROGRAMS += qt/test/test_bitcoin-qt
TESTS += qt/test/test_bitcoin-qt
TEST_QT_MOC_CPP = \
qt/test/moc_compattests.cpp \
qt/test/moc_rpcnestedtests.cpp \
qt/test/moc_uritests.cpp
@ -14,6 +15,7 @@ TEST_QT_MOC_CPP += qt/test/moc_paymentservertests.cpp @@ -14,6 +15,7 @@ TEST_QT_MOC_CPP += qt/test/moc_paymentservertests.cpp
endif
TEST_QT_H = \
qt/test/compattests.h \
qt/test/rpcnestedtests.h \
qt/test/uritests.h \
qt/test/paymentrequestdata.h \
@ -23,6 +25,7 @@ qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_ @@ -23,6 +25,7 @@ qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_
$(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS)
qt_test_test_bitcoin_qt_SOURCES = \
qt/test/compattests.cpp \
qt/test/rpcnestedtests.cpp \
qt/test/test_main.cpp \
qt/test/uritests.cpp \

1
src/Makefile.test.include

@ -52,6 +52,7 @@ BITCOIN_TESTS =\ @@ -52,6 +52,7 @@ BITCOIN_TESTS =\
test/bip32_tests.cpp \
test/blockencodings_tests.cpp \
test/bloom_tests.cpp \
test/bswap_tests.cpp \
test/coins_tests.cpp \
test/compress_tests.cpp \
test/crypto_tests.cpp \

19
src/compat/byteswap.h

@ -15,6 +15,23 @@ @@ -15,6 +15,23 @@
#include <byteswap.h>
#endif
#if defined(__APPLE__)
#if !defined(bswap_16)
// Mac OS X / Darwin features; we include a check for bswap_16 because if it is already defined, protobuf has
// defined these macros for us already; if it isn't, we do it ourselves. In either case, we get the exact same
// result regardless which path was taken
#include <libkern/OSByteOrder.h>
#define bswap_16(x) OSSwapInt16(x)
#define bswap_32(x) OSSwapInt32(x)
#define bswap_64(x) OSSwapInt64(x)
#endif // !defined(bswap_16)
#else
// Non-Mac OS X / non-Darwin
#if HAVE_DECL_BSWAP_16 == 0
inline uint16_t bswap_16(uint16_t x)
{
@ -44,4 +61,6 @@ inline uint64_t bswap_64(uint64_t x) @@ -44,4 +61,6 @@ inline uint64_t bswap_64(uint64_t x)
}
#endif // HAVE_DECL_BSWAP64
#endif // defined(__APPLE__)
#endif // BITCOIN_COMPAT_BYTESWAP_H

23
src/qt/test/compattests.cpp

@ -0,0 +1,23 @@ @@ -0,0 +1,23 @@
// Copyright (c) 2016 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "paymentrequestplus.h" // this includes protobuf's port.h which defines its own bswap macos
#include "compattests.h"
#include "compat/byteswap.h"
void CompatTests::bswapTests()
{
// Sibling in bitcoin/src/test/bswap_tests.cpp
uint16_t u1 = 0x1234;
uint32_t u2 = 0x56789abc;
uint64_t u3 = 0xdef0123456789abc;
uint16_t e1 = 0x3412;
uint32_t e2 = 0xbc9a7856;
uint64_t e3 = 0xbc9a78563412f0de;
QVERIFY(bswap_16(u1) == e1);
QVERIFY(bswap_32(u2) == e2);
QVERIFY(bswap_64(u3) == e3);
}

19
src/qt/test/compattests.h

@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
// Copyright (c) 2009-2015 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_QT_TEST_COMPATTESTS_H
#define BITCOIN_QT_TEST_COMPATTESTS_H
#include <QObject>
#include <QTest>
class CompatTests : public QObject
{
Q_OBJECT
private Q_SLOTS:
void bswapTests();
};
#endif // BITCOIN_QT_TEST_COMPATTESTS_H

4
src/qt/test/test_main.cpp

@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
#include "rpcnestedtests.h"
#include "util.h"
#include "uritests.h"
#include "compattests.h"
#ifdef ENABLE_WALLET
#include "paymentservertests.h"
@ -61,6 +62,9 @@ int main(int argc, char *argv[]) @@ -61,6 +62,9 @@ int main(int argc, char *argv[])
RPCNestedTests test3;
if (QTest::qExec(&test3) != 0)
fInvalid = true;
CompatTests test4;
if (QTest::qExec(&test4) != 0)
fInvalid = true;
ECC_Stop();
return fInvalid;

26
src/test/bswap_tests.cpp

@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
// Copyright (c) 2016 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "compat/byteswap.h"
#include "test/test_bitcoin.h"
#include <boost/test/unit_test.hpp>
BOOST_FIXTURE_TEST_SUITE(bswap_tests, BasicTestingSetup)
BOOST_AUTO_TEST_CASE(bswap_tests)
{
// Sibling in bitcoin/src/qt/test/compattests.cpp
uint16_t u1 = 0x1234;
uint32_t u2 = 0x56789abc;
uint64_t u3 = 0xdef0123456789abc;
uint16_t e1 = 0x3412;
uint32_t e2 = 0xbc9a7856;
uint64_t e3 = 0xbc9a78563412f0de;
BOOST_CHECK(bswap_16(u1) == e1);
BOOST_CHECK(bswap_32(u2) == e2);
BOOST_CHECK(bswap_64(u3) == e3);
}
BOOST_AUTO_TEST_SUITE_END()
Loading…
Cancel
Save