Skip to content

Commit

Permalink
win: skip AddNetworkAdaptor tests on x86 builds
Browse files Browse the repository at this point in the history
SetupDiCallClassInstaller can't be called from a 32 bit app running in
a 64 bit environment, which makes these tests fail on x86 builds.

(cherry picked from commit a2a1d0b)

Bug: 1478120
Change-Id: I36b9c51708c1cf50cc0ecd4dbfd187dd9b994653
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4998805
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Reviewed-by: Nick Harper <nharper@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1219170}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5006529
Auto-Submit: Prudhvikumar Bommana <pbommana@google.com>
Owners-Override: Prudhvikumar Bommana <pbommana@google.com>
Commit-Queue: Prudhvikumar Bommana <pbommana@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/6045@{#1327}
Cr-Branched-From: 905e8bd-refs/heads/main@{#1204232}
  • Loading branch information
David Bienvenu authored and Chromium LUCI CQ committed Nov 13, 2023
1 parent f669e3b commit eaa7671
Showing 1 changed file with 10 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#include "base/test/scoped_feature_list.h"
#include "base/win/scoped_devinfo.h"
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
#include "build/build_config.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "content/public/browser/network_service_instance.h"
#include "content/public/common/content_features.h"
Expand Down Expand Up @@ -168,6 +170,14 @@ IN_PROC_BROWSER_TEST_P(SandboxedNetworkChangeNotifierBrowserTest,
if (!::IsUserAnAdmin()) {
GTEST_SKIP() << "This test requires running elevated.";
}
#if defined(ARCH_CPU_X86)
if (!base::win::OSInfo::GetInstance()->IsWowDisabled()) {
GTEST_SKIP()
<< "SetupDiCallClassInstaller can't be called from a 32 bit app"
<< " running in a 64 bit environment";
}
#endif // defined(ARCH_CPU_X86)

mojo::Remote<network::mojom::NetworkChangeManager> network_change_manager;
GetNetworkService()->GetNetworkChangeManager(
network_change_manager.BindNewPipeAndPassReceiver());
Expand Down

0 comments on commit eaa7671

Please sign in to comment.