From 14e1a20599fc177991c8c32b134e85944841ad0d Mon Sep 17 00:00:00 2001
From: Megvii Engine Team <megengine@megvii.com>
Date: Thu, 10 Sep 2020 16:55:45 +0800
Subject: [PATCH] fix(test): disable mocked tests on Windows

GitOrigin-RevId: 898cfdb09d6b22b2595ecd8db9a3712028928fc6
---
 src/opr/test/dnn/convolution.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/opr/test/dnn/convolution.cpp b/src/opr/test/dnn/convolution.cpp
index b6016bc5..aa79d029 100644
--- a/src/opr/test/dnn/convolution.cpp
+++ b/src/opr/test/dnn/convolution.cpp
@@ -2128,6 +2128,8 @@ TEST(TestOprDNN, ConvolutionMultiCompNode) {
 
 }  // anonymous namespace
 
+#ifndef _WIN32
+
 namespace mgb {
 namespace opr {
 namespace testing {
@@ -2346,5 +2348,6 @@ TEST_F(TestWeightPreprocess, PreprocessCalledOnlyOnce) {
 
 }  // anonymous namespace
 
->>>>>>> 11c3561ca... feat(opr): use weight preprocess feature of MegDNN
+#endif
+
 // vim: syntax=cpp.doxygen foldmethod=marker foldmarker=f{{{,f}}}