Commit: fc0701b4e09d69373dc708e3c3752ce97044d7f5 - system-hardware-interfaces (git)

system/hardware/interfaces

Commit MetaInfo

• Revision: fc0701b4e09d69373dc708e3c3752ce97044d7f5 (tree)
• Time: 2018-04-28 09:43:14
• Author: Bernie Innocenti <codewiz@goog...>
• Commiter: android-build-merger

Log Message

Fix NetdHidlTest.TestAddRemoveInterfaces()
am: 64848957ba

Change-Id: I6915ed661784663ae10cb593e1081ea9c8c688f3

Change Summary

• modified: net/netd/testutils/VtsHalNetNetdTestUtils.cpp

Incremental Difference

--- a/net/netd/testutils/VtsHalNetNetdTestUtils.cpp
+++ b/net/netd/testutils/VtsHalNetNetdTestUtils.cpp
@@ -88,7 +88,8 @@ int countMatchingIpRules(const std::string& regexString) {
 
 int countRulesForFwmark(const uint32_t fwmark) {
     // Skip top nibble, which differs between rules.
-    std::string regex = StringPrintf("from all fwmark 0x[0-9a-f]+%x/.* lookup ", fwmark);
+    std::string regex =
+        StringPrintf("from all fwmark 0x(%x|[0-9a-f]+%04x)/.* lookup ", fwmark, fwmark);
     return countMatchingIpRules(regex);
 }