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: 226ca1159dd1
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 31910c31e095
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 30, 2018

  1. Copy the full SHA
    1b2ae0d View commit details
  2. Merge pull request #2046 from pleroy/2038

    Fix the test to be able to read gipfeli saves
    pleroy authored Dec 30, 2018
    Copy the full SHA
    31910c3 View commit details
Showing with 17 additions and 15 deletions.
  1. +17 −15 ksp_plugin_test/interface_test.cpp
32 changes: 17 additions & 15 deletions ksp_plugin_test/interface_test.cpp
Original file line number Diff line number Diff line change
@@ -91,6 +91,7 @@ using testing_utilities::EqualsProto;
using testing_utilities::FillUniquePtr;
using testing_utilities::ReadFromBinaryFile;
using testing_utilities::ReadFromHexadecimalFile;
using testing_utilities::ReadLinesFromHexadecimalFile;
using ::testing::AllOf;
using ::testing::ByMove;
using ::testing::DoAll;
@@ -656,21 +657,22 @@ TEST_F(InterfaceTest, DeserializePlugin) {
TEST_F(InterfaceTest, DISABLED_DeserializePluginDebug) {
PushDeserializer* deserializer = nullptr;
Plugin const* plugin = nullptr;
std::string const hexadecimal_plugin = ReadFromHexadecimalFile(
R"(P:\Public Mockingbird\Principia\Crashes\1595\persistent.proto.hex)");
principia__DeserializePlugin(
hexadecimal_plugin.c_str(),
hexadecimal_plugin.size(),
&deserializer,
&plugin,
/*compressor=*/"",
"hexadecimal");
principia__DeserializePlugin(hexadecimal_plugin.c_str(),
0,
&deserializer,
&plugin,
/*compressor=*/"",
"hexadecimal");
auto const lines = ReadLinesFromHexadecimalFile(
R"(C:\Users\phl.mantegna\Downloads\2038-long-load_erdos\2038-long-load_erdos.sfs)");
for (std::string const& line : lines) {
principia__DeserializePlugin(line.c_str(),
line.size(),
&deserializer,
&plugin,
/*compressor=*/"gipfeli",
"hexadecimal");
}
principia__DeserializePlugin(lines.front().c_str(),
0,
&deserializer,
&plugin,
/*compressor=*/"gipfeli",
"hexadecimal");
EXPECT_THAT(plugin, NotNull());
principia__DeletePlugin(&plugin);
}