commit 4b06201049f5f1199128c7a373df5f065cf11301
author George Liu <liuxiwei@inspur.com> Tue Oct 13 15:26:58 2020 +0800
committer George Liu <liuxiwei@inspur.com> Mon Mar 29 17:27:27 2021 +0800
tree dc82721917682ce989d362445cd95d410796fb30
parent 52ad07b2a2d58c9c9cf7c9999fd8d5ced95b090b

Add meson build

This commit is to add meson build.
And later, we will remove Autotools and replace it with meson build.

In addition, fixed Layout::LedAction construct parameter error in test
file.

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I58c9a2c9de928db288e77ca2d6aa807d36e70144

test/led-test-map.hpp

diff --git a/test/led-test-map.hpp b/test/led-test-map.hpp
index f76d00e..983fad5 100644
--- a/test/led-test-map.hpp
+++ b/test/led-test-map.hpp
@@ -63,13 +63,13 @@
          {
              {"One", phosphor::led::Layout::Blink, 0, 0,
               phosphor::led::Layout::Blink},
-             {"Two", phosphor::led::Layout::On, 0,
+             {"Two", phosphor::led::Layout::On, 0, 0,
               phosphor::led::Layout::Blink},
-             {"Three", phosphor::led::Layout::Blink, 0,
+             {"Three", phosphor::led::Layout::Blink, 0, 0,
               phosphor::led::Layout::On},
-             {"Four", phosphor::led::Layout::On, 0,
+             {"Four", phosphor::led::Layout::On, 0, 0,
               phosphor::led::Layout::Blink},
-             {"Five", phosphor::led::Layout::On, 0,
+             {"Five", phosphor::led::Layout::On, 0, 0,
               phosphor::led::Layout::Blink},
          }},
 };

test/meson.build

diff --git a/test/meson.build b/test/meson.build
new file mode 100644
index 0000000..feb6578
--- /dev/null
+++ b/test/meson.build
@@ -0,0 +1,26 @@
+test_sources = [
+  '../manager.cpp',
+  '../serialize.cpp',
+  '../utils.cpp'
+]
+
+tests = [
+  'utest.cpp',
+  'utest-serialize.cpp',
+]
+
+if get_option('use-json').enabled()
+  tests += ['utest-led-json.cpp']
+endif
+
+foreach t : tests
+  test(t, executable(t.underscorify(), t,
+                     test_sources,
+                     include_directories: ['..'],
+                     dependencies: [
+                         gtest,
+                         gmock,
+                         deps
+                         ]),
+       workdir: meson.current_source_dir())
+endforeach
\ No newline at end of file

test/utest.cpp

diff --git a/test/utest.cpp b/test/utest.cpp
index 787b345..26e13ec 100644
--- a/test/utest.cpp
+++ b/test/utest.cpp
@@ -354,12 +354,13 @@
         std::set<Layout::LedAction> refAssert = {
             {"One", phosphor::led::Layout::Blink, 0, 0,
              phosphor::led::Layout::Blink},
-            {"Two", phosphor::led::Layout::On, 0, phosphor::led::Layout::Blink},
-            {"Three", phosphor::led::Layout::Blink, 0,
-             phosphor::led::Layout::On},
-            {"Four", phosphor::led::Layout::On, 0,
+            {"Two", phosphor::led::Layout::On, 0, 0,
              phosphor::led::Layout::Blink},
-            {"Five", phosphor::led::Layout::On, 0,
+            {"Three", phosphor::led::Layout::Blink, 0, 0,
+             phosphor::led::Layout::On},
+            {"Four", phosphor::led::Layout::On, 0, 0,
+             phosphor::led::Layout::Blink},
+            {"Five", phosphor::led::Layout::On, 0, 0,
              phosphor::led::Layout::Blink},
         };
         EXPECT_EQ(refAssert.size(), ledsAssert.size());