diff options
| author | William A. Kennington III <wak@google.com> | 2019-01-16 15:00:18 -0800 |
|---|---|---|
| committer | William A. Kennington III <wak@google.com> | 2019-01-16 17:04:14 -0800 |
| commit | af60e63080725d99bf0b1b11acab00b8403baca3 (patch) | |
| tree | 832e71d4bf535926abc7be0e0359781212f517bd | |
| parent | 8d8bc46a9d01b63c79074f01618206598cef1303 (diff) | |
| download | phosphor-watchdog-af60e63080725d99bf0b1b11acab00b8403baca3.tar.gz phosphor-watchdog-af60e63080725d99bf0b1b11acab00b8403baca3.zip | |
test: Rename watchdog_test to watchdog
Tested:
Ran through build and unit test suite.
Change-Id: I3a906ac26c43ac419eef8a98b20a498fe22f942b
Signed-off-by: William A. Kennington III <wak@google.com>
| -rw-r--r-- | test/Makefile.am | 10 | ||||
| -rw-r--r-- | test/watchdog.cpp (renamed from test/watchdog_test.cpp) | 2 | ||||
| -rw-r--r-- | test/watchdog.hpp (renamed from test/watchdog_test.hpp) | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index bb1d048..96764e5 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir) TESTS = $(check_PROGRAMS) # Build/add utest to test suite -check_PROGRAMS = watchdog_test +check_PROGRAMS = watchdog utestCPPFLAGS = $(GTEST_MAIN_CFLAGS) \ $(AM_CPPFLAGS) \ @@ -23,8 +23,8 @@ utestLDFLAGS = $(GTEST_MAIN_LIBS) \ $(PHOSPHOR_LOGGING_LIBS) \ $(PHOSPHOR_DBUS_INTERFACES_LIBS) -watchdog_test_CPPFLAGS = ${utestCPPFLAGS} -watchdog_test_CXXFLAGS = ${utestCXXFLAGS} -watchdog_test_LDFLAGS = ${utestLDFLAGS} +watchdog_CPPFLAGS = ${utestCPPFLAGS} +watchdog_CXXFLAGS = ${utestCXXFLAGS} +watchdog_LDFLAGS = ${utestLDFLAGS} -watchdog_test_SOURCES = ../watchdog.cpp watchdog_test.cpp +watchdog_SOURCES = ../watchdog.cpp watchdog.cpp diff --git a/test/watchdog_test.cpp b/test/watchdog.cpp index 06b43b8..66cca7e 100644 --- a/test/watchdog_test.cpp +++ b/test/watchdog.cpp @@ -1,4 +1,4 @@ -#include "watchdog_test.hpp" +#include "watchdog.hpp" #include <memory> #include <thread> diff --git a/test/watchdog_test.hpp b/test/watchdog.hpp index 4c798a7..09aceed 100644 --- a/test/watchdog_test.hpp +++ b/test/watchdog.hpp @@ -1,8 +1,9 @@ +#include "../watchdog.hpp" + #include <chrono> #include <memory> #include <sdbusplus/bus.hpp> #include <sdeventplus/event.hpp> -#include <watchdog.hpp> #include <gtest/gtest.h> |
