From b92e76f23526c237632c8c7ab8568d29145ffddf Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Wed, 21 Jul 2021 15:30:27 +0900 Subject: [PATCH 1/6] Disable headed tests --- .../platform/tizen/flutter_tizen_engine_unittest.cc | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/shell/platform/tizen/flutter_tizen_engine_unittest.cc b/shell/platform/tizen/flutter_tizen_engine_unittest.cc index 90bb960a72604..dfe58e62a972a 100644 --- a/shell/platform/tizen/flutter_tizen_engine_unittest.cc +++ b/shell/platform/tizen/flutter_tizen_engine_unittest.cc @@ -40,14 +40,6 @@ class FlutterTizenEngineTest : public ::testing::Test { FlutterTizenEngine* engine_; }; -class FlutterTizenEngineTestHeaded : public FlutterTizenEngineTest { - protected: - void SetUp() { - FlutterTizenEngineTest::SetUp(); - engine_->InitializeRenderer(0, 0, 800, 600, false, true); - } -}; - TEST_F(FlutterTizenEngineTest, Run) { EXPECT_TRUE(engine_ != nullptr); EXPECT_TRUE(engine_->RunEngine(nullptr)); @@ -79,11 +71,6 @@ TEST_F(FlutterTizenEngineTest, GetTextureRegistrar) { EXPECT_TRUE(engine_->GetTextureRegistrar() == nullptr); } -TEST_F(FlutterTizenEngineTestHeaded, GetTextureRegistrar) { - EXPECT_TRUE(engine_->RunEngine(nullptr)); - EXPECT_TRUE(engine_->GetTextureRegistrar() != nullptr); -} - TEST_F(FlutterTizenEngineTest, RunDoesExpectedInitialization) { EngineModifier modifier(engine_); bool run_called = false; From 7c9b8b6ec387f38b266a6d8fdd92cafddeb3f1d8 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Wed, 21 Jul 2021 15:44:12 +0900 Subject: [PATCH 2/6] Run unittests in the CI --- azure-pipelines.yml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9800a45387427..2fae089d87fd6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -100,8 +100,30 @@ jobs: failOnStderr: true - publish: $(Build.StagingDirectory) artifact: $(System.JobName) -- job: release +- job: test dependsOn: build + pool: + name: Default + demands: agent.os -equals Linux + timeoutInMinutes: 20 + cancelTimeoutInMinutes: 1 + steps: + - checkout: self + path: src/flutter + - bash: | + gclient sync -f -D + flutter/tools/gn \ + --no-goma \ + --runtime-mode debug \ + --enable-fontconfig \ + --build-tizen-shell + ninja -C out/host_debug + out/host_debug/flutter_tizen_unittests + displayName: Build and run unittests + workingDirectory: $(Pipeline.Workspace)/src + failOnStderr: true +- job: release + dependsOn: test pool: name: Default demands: agent.os -equals Linux From 1eda0d86ebfa18af7336c02c955df8a534a0fcb8 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Wed, 21 Jul 2021 16:23:42 +0900 Subject: [PATCH 3/6] Revert "Disable headed tests" This reverts commit b92e76f23526c237632c8c7ab8568d29145ffddf. --- .../platform/tizen/flutter_tizen_engine_unittest.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/shell/platform/tizen/flutter_tizen_engine_unittest.cc b/shell/platform/tizen/flutter_tizen_engine_unittest.cc index dfe58e62a972a..90bb960a72604 100644 --- a/shell/platform/tizen/flutter_tizen_engine_unittest.cc +++ b/shell/platform/tizen/flutter_tizen_engine_unittest.cc @@ -40,6 +40,14 @@ class FlutterTizenEngineTest : public ::testing::Test { FlutterTizenEngine* engine_; }; +class FlutterTizenEngineTestHeaded : public FlutterTizenEngineTest { + protected: + void SetUp() { + FlutterTizenEngineTest::SetUp(); + engine_->InitializeRenderer(0, 0, 800, 600, false, true); + } +}; + TEST_F(FlutterTizenEngineTest, Run) { EXPECT_TRUE(engine_ != nullptr); EXPECT_TRUE(engine_->RunEngine(nullptr)); @@ -71,6 +79,11 @@ TEST_F(FlutterTizenEngineTest, GetTextureRegistrar) { EXPECT_TRUE(engine_->GetTextureRegistrar() == nullptr); } +TEST_F(FlutterTizenEngineTestHeaded, GetTextureRegistrar) { + EXPECT_TRUE(engine_->RunEngine(nullptr)); + EXPECT_TRUE(engine_->GetTextureRegistrar() != nullptr); +} + TEST_F(FlutterTizenEngineTest, RunDoesExpectedInitialization) { EngineModifier modifier(engine_); bool run_called = false; From c33e471331c23e015c3dc01553f083798a398e15 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Wed, 21 Jul 2021 16:26:29 +0900 Subject: [PATCH 4/6] Disable test GetTextureRegistrar --- shell/platform/tizen/flutter_tizen_engine_unittest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell/platform/tizen/flutter_tizen_engine_unittest.cc b/shell/platform/tizen/flutter_tizen_engine_unittest.cc index 90bb960a72604..b5a9f4fc656f9 100644 --- a/shell/platform/tizen/flutter_tizen_engine_unittest.cc +++ b/shell/platform/tizen/flutter_tizen_engine_unittest.cc @@ -79,7 +79,8 @@ TEST_F(FlutterTizenEngineTest, GetTextureRegistrar) { EXPECT_TRUE(engine_->GetTextureRegistrar() == nullptr); } -TEST_F(FlutterTizenEngineTestHeaded, GetTextureRegistrar) { +// Disabled for headless testing. +TEST_F(FlutterTizenEngineTestHeaded, DISABLED_GetTextureRegistrar) { EXPECT_TRUE(engine_->RunEngine(nullptr)); EXPECT_TRUE(engine_->GetTextureRegistrar() != nullptr); } From 40ce6e19956f06b88882d28620681529425e7ad2 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Wed, 21 Jul 2021 16:44:01 +0900 Subject: [PATCH 5/6] Replace gclient sync with git checkout --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2fae089d87fd6..975771e38f446 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -111,7 +111,7 @@ jobs: - checkout: self path: src/flutter - bash: | - gclient sync -f -D + git checkout -- build/config/compiler/BUILD.gn flutter/tools/gn \ --no-goma \ --runtime-mode debug \ From 34bfefeb71885ef22e0585f1bfefbb0355bd24ac Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Wed, 21 Jul 2021 17:13:25 +0900 Subject: [PATCH 6/6] Separate the run step --- azure-pipelines.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 975771e38f446..65aee0e04a6db 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -118,10 +118,12 @@ jobs: --enable-fontconfig \ --build-tizen-shell ninja -C out/host_debug - out/host_debug/flutter_tizen_unittests - displayName: Build and run unittests + displayName: Build unittests workingDirectory: $(Pipeline.Workspace)/src failOnStderr: true + - bash: out/host_debug/flutter_tizen_unittests + displayName: Run + workingDirectory: $(Pipeline.Workspace)/src - job: release dependsOn: test pool: