Skip to content

Commit

Permalink
build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewsavage1 committed Jan 31, 2025
1 parent 6d91a03 commit 795fcc5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 33 deletions.
15 changes: 0 additions & 15 deletions base/test/run_all_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,6 @@
#include "base/time/time.h"
#include "build/build_config.h"


#if BUILDFLAG(IS_STARBOARD)
#include "base/test/allow_check_is_test_for_testing.h"
#include "starboard/client_porting/wrap_main/wrap_main.h"


int TestSuiteRun(int argc, char** argv) {
base::AtExitManager exit_manager;
base::test::AllowCheckIsTestForTesting();
return base::TestSuite(argc, argv).Run();
}

STARBOARD_WRAP_SIMPLE_MAIN(TestSuiteRun);
#else
#if BUILDFLAG(IS_WIN)
#include "base/win/com_init_util.h"
#endif // BUILDFLAG(IS_WIN)
Expand Down Expand Up @@ -85,4 +71,3 @@ int main(int argc, char** argv) {
argc, argv,
base::BindOnce(&base::TestSuite::Run, base::Unretained(&test_suite)));
}
#endif
18 changes: 0 additions & 18 deletions base/time/time_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#if BUILDFLAG(IS_STARBOARD)
#include "starboard/common/time.h" // nogncheck
#include "starboard/types.h" // nogncheck
#include "base/test/time_helpers.h" // nogncheck
#include "starboard/client_porting/eztime/eztime.h" // nogncheck
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/jni_android.h"
Expand Down Expand Up @@ -536,22 +535,6 @@ TEST_F(TimeTest, LocalMidnightIsLocal) {
}
#endif // BUILDFLAG(IS_FUCHSIA)

#if BUILDFLAG(IS_STARBOARD)
TEST_F(TimeTest, ParseTimeTest1) {
Time now = Time::Now();

Time parsed_time;
std::string formatted = base::test::time_helpers::TimeFormatUTC(now);
EXPECT_TRUE(Time::FromUTCString(formatted.c_str(), &parsed_time));
EXPECT_GE(1, (now - parsed_time).InSecondsF());
EXPECT_GE(1, (parsed_time - now).InSecondsF());

formatted = base::test::time_helpers::TimeFormatLocal(now);
EXPECT_TRUE(Time::FromString(formatted.c_str(), &parsed_time));
EXPECT_GE(1, (now - parsed_time).InSecondsF());
EXPECT_GE(1, (parsed_time - now).InSecondsF());
}
#else // !BUILDFLAG(IS_STARBOARD)
TEST_F(TimeTest, ParseTimeTest1) {
time_t current_time = 0;
time(&current_time);
Expand All @@ -570,7 +553,6 @@ TEST_F(TimeTest, ParseTimeTest1) {
EXPECT_TRUE(Time::FromString(time_buf, &parsed_time));
EXPECT_EQ(current_time, parsed_time.ToTimeT());
}
#endif

TEST_F(TimeTest, DayOfWeekSunday) {
Time time;
Expand Down

0 comments on commit 795fcc5

Please sign in to comment.