mirror of
https://github.com/NixOS/nix
synced 2025-06-25 19:01:16 +02:00
Enable most of the third BuildResult
worker protocol test
This was somewhat of a false alarm. The problem was not that the
protocol implementation actually failed to round trip, but that two of
the fields were ignored entirely --- not serialized and deserialized at
all.
For reference, those fields were added in
fa68eb367e
.
This commit is contained in:
parent
2f1c16dfa2
commit
e1af175707
2 changed files with 6 additions and 5 deletions
|
@ -187,7 +187,7 @@ CHARACTERIZATION_TEST(
|
||||||
"build-result",
|
"build-result",
|
||||||
({
|
({
|
||||||
using namespace std::literals::chrono_literals;
|
using namespace std::literals::chrono_literals;
|
||||||
std::tuple<BuildResult, BuildResult/*, BuildResult*/> t {
|
std::tuple<BuildResult, BuildResult, BuildResult> t {
|
||||||
BuildResult {
|
BuildResult {
|
||||||
.status = BuildResult::OutputRejected,
|
.status = BuildResult::OutputRejected,
|
||||||
.errorMsg = "no idea why",
|
.errorMsg = "no idea why",
|
||||||
|
@ -200,9 +200,6 @@ CHARACTERIZATION_TEST(
|
||||||
.startTime = 30,
|
.startTime = 30,
|
||||||
.stopTime = 50,
|
.stopTime = 50,
|
||||||
},
|
},
|
||||||
#if 0
|
|
||||||
// This is commented because this test would fail!
|
|
||||||
// FIXME uncomment this and fix the underlying bug.
|
|
||||||
BuildResult {
|
BuildResult {
|
||||||
.status = BuildResult::Built,
|
.status = BuildResult::Built,
|
||||||
.timesBuilt = 1,
|
.timesBuilt = 1,
|
||||||
|
@ -230,10 +227,14 @@ CHARACTERIZATION_TEST(
|
||||||
},
|
},
|
||||||
.startTime = 30,
|
.startTime = 30,
|
||||||
.stopTime = 50,
|
.stopTime = 50,
|
||||||
|
#if 0
|
||||||
|
// These fields are not yet serialized.
|
||||||
|
// FIXME Include in next version of protocol or document
|
||||||
|
// why they are skipped.
|
||||||
.cpuUser = std::chrono::milliseconds(500s),
|
.cpuUser = std::chrono::milliseconds(500s),
|
||||||
.cpuSystem = std::chrono::milliseconds(604s),
|
.cpuSystem = std::chrono::milliseconds(604s),
|
||||||
},
|
|
||||||
#endif
|
#endif
|
||||||
|
},
|
||||||
};
|
};
|
||||||
t;
|
t;
|
||||||
}))
|
}))
|
||||||
|
|
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue