Merge pull request #9094 from obsidiansystems/test-proto

Test the rest of the worker protocol serializers

(cherry picked from commit 2f1c16dfa2378fd8616bff1b9b7cd0b4d42af69b)
Change-Id: Idfd72d32b21d14a260e02f65531d287cef7464d2

src/libstore/build-result.cc

@@ -0,0 +1,18 @@
+#include "build-result.hh"
+
+namespace nix {
+
+GENERATE_CMP_EXT(
+    ,
+    BuildResult,
+    me->status,
+    me->errorMsg,
+    me->timesBuilt,
+    me->isNonDeterministic,
+    me->builtOutputs,
+    me->startTime,
+    me->stopTime,
+    me->cpuUser,
+    me->cpuSystem);
+
+}

src/libstore/build-result.hh

@@ -3,6 +3,7 @@
 
 #include "realisation.hh"
 #include "derived-path.hh"
+#include "comparator.hh"
 
 #include <string>
 #include <chrono>
@@ -100,6 +101,8 @@ struct BuildResult
      */
     std::optional<std::chrono::microseconds> cpuUser, cpuSystem;
 
+    DECLARE_CMP(BuildResult);
+
     bool success()
     {
         return status == Built || status == Substituted || status == AlreadyValid || status == ResolvesToAlreadyValid;

src/libstore/worker-protocol.hh

@@ -208,10 +208,10 @@ MAKE_WORKER_PROTO(ContentAddress);
 template<>
 MAKE_WORKER_PROTO(DerivedPath);
 template<>
-MAKE_WORKER_PROTO(Realisation);
-template<>
 MAKE_WORKER_PROTO(DrvOutput);
 template<>
+MAKE_WORKER_PROTO(Realisation);
+template<>
 MAKE_WORKER_PROTO(BuildResult);
 template<>
 MAKE_WORKER_PROTO(KeyedBuildResult);