Disable MC/GA_valid_request_and_cancel_P test on emulator

No waiting for communication with the device
causes response callback to be called immediately
which makes wauthn_cancel() return
WAUTHN_ERROR_NOT_ALLOWED

Change-Id: Ic5478534f8327f4ed5de40eb21b07f2df22debb5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e730e4af1e42d993e5fc311ed5d9aef521b4112..6701f91345fb33366d4389c796f3c616095ef185 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,10 @@ IF(NOT DEFINED COVERAGE_DIR)
     SET(COVERAGE_DIR "${SHARE_INSTALL_PREFIX}/${PROJECT_NAME}-coverage")
 ENDIF(NOT DEFINED COVERAGE_DIR)
 
+IF (EMULATOR_BUILD MATCHES 1)
+    ADD_COMPILE_DEFINITIONS(EMULATOR_BUILD=1)
+ENDIF (EMULATOR_BUILD MATCHES 1)
+
 # Force PIE
 SET(CMAKE_POSITION_INDEPENDENT_CODE "True")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")

diff --git a/packaging/webauthn.spec b/packaging/webauthn.spec
index 663bb9d36958e52e603d91afe550c2434a4a5baa..7b010fee65fe653dc051baf544a9796601b8106e 100644 (file)
--- a/packaging/webauthn.spec
+++ b/packaging/webauthn.spec
@@ -168,6 +168,9 @@ Base utils gcov objects
          -DMANIFESTDIR=%{MANIFESTDIR} \
          -DICONDIR=%{ICONDIR} \
          -DMANTESTBINDIR=%{MANTESTBINDIR} \
+%if "%_repository" == "emulator"
+         -DEMULATOR_BUILD=1 \
+%endif
 %if 0%{?no_feature_check:1} || "%_repository" == "emulator"
          -DNO_FEATURE_CHECK= \
 %endif

diff --git a/tests/webauthn-client-test.cpp b/tests/webauthn-client-test.cpp
index 774aa63ebe59780bae431aa5d54dfb19760151ce..74b27e51b226014c51b74fa2f6ad6f8783bded8d 100644 (file)
--- a/tests/webauthn-client-test.cpp
+++ b/tests/webauthn-client-test.cpp
@@ -130,6 +130,7 @@ TEST_F(WebAuthnAPITest, cancel_not_allowed_N)
     EXPECT_EQ(ret, WAUTHN_ERROR_NOT_ALLOWED);
 }
 
+#ifndef EMULATOR_BUILD
 TEST_F(WebAuthnAPITest, MC_valid_request_and_cancel_P)
 {
     sleep(3); // wait 3 secs for make interval
@@ -167,6 +168,6 @@ TEST_F(WebAuthnAPITest, GA_valid_request_and_cancel_P)
     EXPECT_EQ(ret, WAUTHN_ERROR_NONE);
     sleep(3); // wait 3 secs for make interval
 }
-
+#endif
 
 } // namespace WA