Copy prybar assets into Nix derivation

Fix prybar Nix tests

build-prybar.nix

@@ -2,7 +2,7 @@
 , pkgName ? language }:
 
 { lib, buildGoModule, fetchFromGitHub, bash, expect, pkg-config, runCommand, git
-, python3, copyPathToStore, rev }:
+, python3, copyPathToStore, rev, makeWrapper }:
 
 buildGoModule {
   pname = "prybar-${language}";
@@ -11,7 +11,7 @@ buildGoModule {
   src = ./.;
 
   inherit buildInputs;
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config makeWrapper ];
 
   subPackages = [ "languages/${language}" ];
 
@@ -49,6 +49,8 @@ buildGoModule {
     # is running in.
     export HOME=$(echo pwd)
 
+    patchShebangs run_no_pty ./tests/${language}/*.exp
+
     "${bash}/bin/bash" "./run_tests_language" "${language}" "${expect}/bin"
 
     runHook postCheck
@@ -61,5 +63,14 @@ buildGoModule {
 
   postInstall = ''
     mv $out/bin/${language} $out/bin/prybar-${language}
+
+    if [ -d "./prybar_assets/${language}" ] 
+    then
+      mkdir -p "$out/prybar_assets/${language}"
+      cp -R "./prybar_assets/${language}" "$out/prybar_assets/"
+
+      wrapProgram "$out/bin/prybar-${language}" \
+        --set PRYBAR_ASSETS_DIR "$out/prybar_assets"
+    fi
   '';
 }

languages/nodejs/repl.js

@@ -3,13 +3,10 @@ const repl = require("repl");
 const path = require("path");
 const fs = require("fs");
 const vm = require("vm");
-const { isatty } = require('tty');
-const rl = require(path.join(
-  process.cwd(),
-  "prybar_assets",
-  "nodejs",
-  "input-sync.js"
-));
+const { isatty } = require("tty");
+const assets_dir =
+  process.env.PRYBAR_ASSETS_DIR || path.join(process.cwd(), "prybar_assets");
+const rl = require(path.join(assets_dir, "nodejs", "input-sync.js"));
 const Module = require("module");
 
 let r;

run_no_pty

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 stdin="/tmp/prybar_stdin"
 stdout="/tmp/prybar_stdout"
 stderr="/tmp/prybar_stderr"

tests/clojure/all.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # ignore ANSI escape sequences
 set _ "(?:.*?)"

tests/clojure/evaluate_expression.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # ignore ANSI escape sequences
 set _ "(?:.*?)"

tests/clojure/initialize_code_with_script.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # ignore ANSI escape sequences
 set _ "(?:.*?)"

tests/clojure/initialize_expression_with_script.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # ignore ANSI escape sequences
 set _ "(?:.*?)"

tests/clojure/initialize_repl_with_script.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # ignore ANSI escape sequences
 set _ "(?:.*?)"

tests/clojure/plus_1_1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # ignore ANSI escape sequences
 set _ "(?:.*?)"

tests/clojure/print.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # ignore ANSI escape sequences
 set _ "(?:.*?)"

tests/clojure/quiet_repl.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # ignore ANSI escape sequences
 set _ "(?:.*?)"

tests/clojure/run_code.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-clojure -q -c {(do (println "foo") "bar")}

tests/clojure/run_script.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-clojure ./test_files/hello.clj
 expect eof

tests/julia/1_plus_1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-julia -q -i

tests/julia/header.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 #
 # This Expect script was generated by autoexpect on Fri Jun 12 21:00:42 2020
 # Expect and autoexpect were both written by Don Libes, NIST.

tests/julia/input.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-julia -q -i

tests/julia/print_a_line.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-julia -q -i

tests/julia/start_with_file.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-julia -q -i ./test_files/hi_julia.jl

tests/lua/always_try_expression.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-lua -q -i

tests/lua/history.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-lua -q -i

tests/lua/load_file.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-lua -i ./test_files/hello.lua

tests/lua/ps1_ps2.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-lua -i -ps1 ps1 -ps2 ps2

tests/lua/quiet.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-lua -q -i

tests/lua/returns.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-lua -q -i

tests/nodejs/1_plus_1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q

tests/nodejs/confirm.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q

tests/nodejs/err.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q

tests/nodejs/eval_code.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -q -e 1+1

tests/nodejs/global_bug.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i ./test_files/global_bug.js

tests/nodejs/header.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i

tests/nodejs/module_patching.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i ./test_files/global_bug.js

tests/nodejs/printing.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q

tests/nodejs/prompt_escape.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q

tests/nodejs/prompt_no_tty.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 set timeout -1
 set stty_init raw
 spawn ./run_no_pty ./prybar-nodejs -q -i

tests/nodejs/prompt_tty.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q

tests/nodejs/prompt_tty_bounds.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q

tests/nodejs/prompt_tty_escapes.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q

tests/nodejs/run_code.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -q -c 1+1

tests/nodejs/run_file.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i ./test_files/hello.js

tests/nodejs/set_ps1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-nodejs -i -q -ps1 custom

tests/ocaml/code_print.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-ocaml -q -c "print_endline(\"hello world\")"
 match_max 100000

tests/ocaml/exception.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-ocaml -q -i
 match_max 100000

tests/ocaml/expr.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-ocaml -q -e 1+1
 match_max 100000

tests/ocaml/not_quiet.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-ocaml -e 1+1
 match_max 100000

tests/ocaml/ps1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-ocaml -q -i -ps1 ">>"
 match_max 100000

tests/ocaml/ps2.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-ocaml -q -i -ps2 continuation
 match_max 100000

tests/ocaml/quiet.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-ocaml -q -i
 match_max 100000

tests/python2/1_plus_1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-python2 -i
 match_max 100000

tests/python2/code_print.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-python2 -q -c print('hello')
 match_max 100000

tests/python2/exception.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-python2 -q -i
 match_max 100000

tests/python2/expr.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-python2 -e 1+1
 match_max 100000

tests/python2/ps1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-python2 -i -ps1 somethingelse
 match_max 100000

tests/python2/ps2.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-python2 -i -ps2 continuation
 match_max 100000

tests/python2/quiet.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-python2 -q -i
 match_max 100000

tests/python2/stdout_stderr.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-python2 -q -i
 match_max 100000

tests/python3/1_plus_1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-python3 -i -q

tests/python3/eval_code.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-python3 -e 1+1

tests/python3/printing.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-python3 -i -q

tests/python3/run_code.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-python3 -c print('hello')

tests/python3/set_ps1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-python3 -i -q -ps1 custom

tests/python3/set_ps2.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-python3 -i -q -ps2 custom

tests/python3/show_header.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-python3 -i

tests/python3/stderr_red.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 # red is currently nondeterministic
 exit 0

tests/sqlite/1_plus_1.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-sqlite -q -i
 expect -- "^--> "

tests/sqlite/eval.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-sqlite -e "select 1+1;"
 expect ^2

tests/sqlite/exec.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-sqlite -c "select 1+1;"
 expect ^eof

tests/sqlite/header.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-sqlite -i
 expect -gl "-- Loading resources from /tmp/sqlite-config*\r\nSQLite version 3.27.2*\r\nEnter \".help\" for usage hints.\r\n--> "

tests/sqlite/quiet.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-sqlite -q -i
 expect "^--> "

tests/sqlite/read_file.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 spawn ./prybar-sqlite -q -i ./test_files/hello.sql
 expect -- "^hey there\r

tests/tcl/a_few_outputs.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-tcl -q -i

tests/tcl/from_file.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-tcl -q -i ./test_files/hello_tcl.tcl

tests/tcl/input_output.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-tcl -q -i

tests/tcl/invalid_command.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-tcl -q -i ./test-files/hi_julia.jl

tests/tcl/unknown_command.exp

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S expect -f
+#!/usr/bin/expect -f
 
 set timeout -1
 spawn ./prybar-tcl -q -i