Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Fix status library headers and move test (#1118) 

For some reason, the status util unittest was in media/base/ instead of
status/

The broken headers in the status library were not obviously broken until
media/base/ porting started, and they were used for the first time.

Issue #1047 (CMake porting)
This commit is contained in:
Joey Parrish 2022-10-24 19:09:10 -07:00 committed by GitHub
parent 7ed49d4403
commit 64993873c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packager/status/CMakeLists.txt
View File

@ -15,6 +15,7 @@ if(LIBPACKAGER_SHARED)
endif() endif()
add_executable(status_unittest add_executable(status_unittest
status_test_util_unittest.cc
status_unittest.cc) status_unittest.cc)
target_link_libraries(status_unittest target_link_libraries(status_unittest
status status

2
packager/status/status_macros.h
View File

@ -7,7 +7,7 @@
#ifndef PACKAGER_STATUS_MACROS_H_ #ifndef PACKAGER_STATUS_MACROS_H_
#define PACKAGER_STATUS_MACROS_H_ #define PACKAGER_STATUS_MACROS_H_
#include "packager/status.h" #include "packager/status/status.h"
// Evaluates an expression that produces a `Status`. If the status is not // Evaluates an expression that produces a `Status`. If the status is not
// ok, returns it from the current function. // ok, returns it from the current function.

2
packager/status/status_test_util.h
View File

@ -9,7 +9,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/status.h" #include "packager/status/status.h"
#define EXPECT_OK(val) EXPECT_EQ(shaka::Status::OK, (val)) #define EXPECT_OK(val) EXPECT_EQ(shaka::Status::OK, (val))
#define ASSERT_OK(val) ASSERT_EQ(shaka::Status::OK, (val)) #define ASSERT_OK(val) ASSERT_EQ(shaka::Status::OK, (val))

2
packager/media/base/status_test_util_unittest.cc → packager/status/status_test_util_unittest.cc
View File

@ -6,7 +6,7 @@
#include <gtest/gtest-spi.h> #include <gtest/gtest-spi.h>
#include "packager/status_test_util.h" #include "packager/status/status_test_util.h"
namespace shaka { namespace shaka {
namespace media { namespace media {