diff options
| -rw-r--r-- | scripts/build.sh | 5 | ||||
| -rw-r--r-- | scripts/rebuild.sh | 2 | ||||
| -rw-r--r-- | test/elevator/test_01.cpp | 50 |
3 files changed, 7 insertions, 50 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index b37ba3d..21d4d47 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -34,7 +34,8 @@ buildit() { mkdir -p build-$archabi cd build-$archabi # CLANG_ARGS="-DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++" - cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILD_TESTING=ON .. + # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILD_TESTING=ON .. + cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILD_TESTING=ON -DDEBUG=ON .. # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON .. # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DUSE_STRIP=OFF .. # cmake $CLANG_ARGS -DCMAKE_INSTALL_PREFIX=$rootdir/dist-$archabi -DBUILDJAVA=ON -DBUILDEXAMPLES=ON -DBUILD_TESTING=ON -DUSE_STRIP=ON -DJAVAC_DEBUG_ARGS="none" .. @@ -47,7 +48,7 @@ buildit() { make -j $CPU_COUNT install test if [ $? -eq 0 ] ; then echo "BUILD SUCCESS $bname $archabi" - cp -a examples/* $rootdir/dist-$archabi/bin + # cp -a examples/* $rootdir/dist-$archabi/bin cd $rootdir return 0 else diff --git a/scripts/rebuild.sh b/scripts/rebuild.sh index 7155f58..e470a4c 100644 --- a/scripts/rebuild.sh +++ b/scripts/rebuild.sh @@ -29,7 +29,7 @@ buildit() { make -j $CPU_COUNT install test if [ $? -eq 0 ] ; then echo "REBUILD SUCCESS $bname $archabi" - cp -a examples/* $rootdir/dist-$archabi/bin + # cp -a examples/* $rootdir/dist-$archabi/bin cd $rootdir return 0 else diff --git a/test/elevator/test_01.cpp b/test/elevator/test_01.cpp index 44c43f4..6a8c01d 100644 --- a/test/elevator/test_01.cpp +++ b/test/elevator/test_01.cpp @@ -8,55 +8,11 @@ #include <catch2/catch_amalgamated.hpp> #include <jau/test/catch2_ext.hpp> -#include <direct_bt/UUID.hpp> +#include <elevator/elevator.hpp> -using namespace direct_bt; +using namespace elevator; -TEST_CASE( "UUID Test 01", "[datatype][uuid]" ) { +TEST_CASE( "Elevator Test 01", "[nop][none]" ) { std::cout << "Hello COUT" << std::endl; std::cerr << "Hello CERR" << std::endl; - - uint8_t buffer[100]; - static uint8_t uuid128_bytes[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, - 0x80, 0x00, 0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB }; - - { - const uuid128_t v01 = uuid128_t(uuid128_bytes, 0, true); - REQUIRE(v01.getTypeSizeInt() == 16); - REQUIRE(v01.getTypeSizeInt() == sizeof(v01.value)); - REQUIRE(v01.getTypeSizeInt() == sizeof(v01.value.data)); - REQUIRE( 0 == memcmp(uuid128_bytes, v01.data(), 16) ); - - put_uuid(buffer, 0, v01, true); - std::shared_ptr<const uuid_t> v02 = uuid_t::create(uuid_t::TypeSize::UUID128_SZ, buffer, 0, true); - REQUIRE(v02->getTypeSizeInt() == 16); - REQUIRE( 0 == memcmp(v01.data(), v02->data(), 16) ); - REQUIRE( v01.toString() == v02->toString() ); - } - - { - const uuid32_t v01 = uuid32_t(uuid32_t(0x12345678)); - REQUIRE(v01.getTypeSizeInt() == 4); - REQUIRE(v01.getTypeSizeInt() == sizeof(v01.value)); - REQUIRE(0x12345678 == v01.value); - - put_uuid(buffer, 0, v01, true); - std::shared_ptr<const uuid_t> v02 = uuid_t::create(uuid_t::TypeSize::UUID32_SZ, buffer, 0, true); - REQUIRE(v02->getTypeSizeInt() == 4); - REQUIRE( 0 == memcmp(v01.data(), v02->data(), 4) ); - REQUIRE( v01.toString() == v02->toString() ); - } - - { - const uuid16_t v01 = uuid16_t(uuid16_t(0x1234)); - REQUIRE(v01.getTypeSizeInt() == 2); - REQUIRE(v01.getTypeSizeInt() == sizeof(v01.value)); - REQUIRE(0x1234 == v01.value); - - put_uuid(buffer, 0, v01, true); - std::shared_ptr<const uuid_t> v02 = uuid_t::create(uuid_t::TypeSize::UUID16_SZ, buffer, 0, true); - REQUIRE(v02->getTypeSizeInt() == 2); - REQUIRE( 0 == memcmp(v01.data(), v02->data(), 2) ); - REQUIRE( v01.toString() == v02->toString() ); - } } |