Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fa67e924e872
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7bb569ff0d35
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 26, 2017

  1. macros

    @eggrobin
    eggrobin committed May 26, 2017
    Copy the full SHA
    fc1a8e5 View commit details

  2. Merge remote-tracking branch 'la-vache/master' into disable-resonance… 

    …-tests
    @eggrobin
    eggrobin committed May 26, 2017
    Copy the full SHA
    55c81bf View commit details

  3. Merge pull request #1401 from eggrobin/disable-resonance-tests 

    Disable resonance tests on Linux
    @pleroy
    pleroy authored May 26, 2017
    Copy the full SHA
    7bb569f View commit details
Showing with 8 additions and 2 deletions.
  1. +2 −2 astronomy/ksp_resonance_test.cpp
  2. +6 −0 base/macros.hpp
4 changes: 2 additions & 2 deletions astronomy/ksp_resonance_test.cpp
View file
Original file line number Diff line number Diff line change
@@ -242,7 +242,7 @@ class KSPResonanceTest : public ::testing::Test {

#if !defined(_DEBUG)

TEST_F(KSPResonanceTest, Stock) {
TEST_F(KSPResonanceTest, MSVC_ONLY_TEST(Stock)) {
auto const ephemeris = MakeEphemeris();
ephemeris->Prolong(short_term_);
EXPECT_OK(ephemeris->last_severe_integration_status());
@@ -297,7 +297,7 @@ TEST_F(KSPResonanceTest, Stock) {
"stock");
}

TEST_F(KSPResonanceTest, Corrected) {
TEST_F(KSPResonanceTest, MSVC_ONLY_TEST(Corrected)) {
StabilizeKSP(solar_system_);

auto const ephemeris = MakeEphemeris();
6 changes: 6 additions & 0 deletions base/macros.hpp
View file
Original file line number Diff line number Diff line change
@@ -199,6 +199,12 @@ inline void noreturn() { std::exit(0); }
# define CONSTEXPR_INFINITY constexpr
#endif

#if PRINCIPIA_COMPILER_MSVC
#define MSVC_ONLY_TEST(test_name) test_name
#else
#define MSVC_ONLY_TEST(test_name) DISABLED_##test_name
#endif

// For templates in macro parameters.
#define TEMPLATE(...) template<__VA_ARGS__>