gtirb-semantics: test and fix bundled python scripts.

katrinafyi · Feb 7, 2024 · 46819bf · 46819bf
1 parent ec4944a
commit 46819bf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/gtirb/gtirb-semantics.nix b/gtirb/gtirb-semantics.nix
@@ -1,8 +1,10 @@
 { lib
+, buildDunePackage
 , fetchFromGitHub
+, testVersion
 , protobuf
 , asli
-, buildDunePackage
+, libllvm
 , ocaml-protoc-plugin
 , ocaml-hexstring
 , base64
@@ -11,6 +13,7 @@
 , makePythonPth
 , python3Packages
 , python-gtirb
+, gtirb-semantics
 }:
 
 let
@@ -29,9 +32,9 @@ let
     '';
   };
 
-  pth = makePythonPth python3Packages "gtirb-semantics" [ protobuf ];
+  pth = makePythonPth python3Packages "gtirb-semantics" [ protobuf libllvm ];
   python' = python3Packages.python.withPackages
-    (p: [ p.protobuf pth python-gtirb ]);
+    (p: [ pth python-gtirb ]);
 
 in
 buildDunePackage {
@@ -56,6 +59,17 @@ buildDunePackage {
 
   outputs = [ "out" "dev" ];
 
+  passthru.tests.test-debug-gts = testVersion {
+    package = gtirb-semantics;
+    command = "debug-gts.py --help";
+    version = "debug-gts.py";
+  };
+  passthru.tests.test-proto-json = testVersion {
+    package = gtirb-semantics;
+    command = "proto-json.py --help";
+    version = "proto-json.py";
+  };
+
   meta = {
     homepage = "https://github.com/UQ-PAC/gtirb-semantics";
     description = "Add instruction semantics to the IR of a dissassembled ARM64 binary";

diff --git a/gtirb/python-gtirb.nix b/gtirb/python-gtirb.nix
@@ -8,7 +8,8 @@ python3Packages.buildPythonPackage {
 
   src = gtirb.python;
 
-  buildInputs = with python3Packages; [ pip networkx typing-extensions sortedcontainers intervaltree protobuf3 ];
+  buildInputs = with python3Packages; [ pip ];
+  propagatedBuildInputs = with python3Packages; [ networkx typing-extensions sortedcontainers intervaltree protobuf3 ];
 
   preConfigure = ''
     ln -s /build/gtirb* /build/source