diff --git a/fail.just b/fail.just index 4714ecd..87e067d 100644 --- a/fail.just +++ b/fail.just @@ -112,10 +112,10 @@ result module: [doc("Dump FAIL* markers to CSV")] [group("4: fail")] result-csv module: - # INTO OUTFILE '/home/lab/smchurla/out.csv' - # FIELDS TERMINATED BY ',' ENCLOSED BY '\"' - # LINES TERMINATED BY '\n';" - @echo "SELECT CONCAT(\"0x\", HEX(p.injection_instr_absolute)) AS fault_address, SUM(t.time2 - t.time1 + 1) AS total_fail_markers FROM trace t \ + @echo "SELECT \ + CONCAT(\"0x\", HEX(p.injection_instr_absolute)) AS fault_address, \ + SUM(t.time2 - t.time1 + 1) AS total_fail_markers \ + FROM trace t \ JOIN variant v ON v.id = t.variant_id \ JOIN fspgroup g ON g.variant_id = t.variant_id AND g.instr2 = t.instr2 AND g.data_address = t.data_address \ JOIN result_GenericExperimentMessage r ON r.pilot_id = g.pilot_id \ diff --git a/nixos.just b/nixos.just index fa7243c..b0daa3d 100644 --- a/nixos.just +++ b/nixos.just @@ -137,10 +137,18 @@ r2i module addr="dbg.os_main": # Just do it # =================================================================================================================== # +[arg("mode", pattern="c|aot|interp", help="Which WASM mode to use")] +[arg("target", pattern="fail|linux|linux-baremetal", help="Which platform to compile for")] [doc("Perform all steps for a fail/linux/linux-bm build with aot/interp WASM")] [group("5: just do it")] -build module target="fail" mode="aot": +build module="__help" target="fail" mode="aot": #!/usr/bin/env sh + + if [ "{{ module }}" = "__help" ]; then + just --usage build + exit 0 + fi + just clean {{ module }} just create-build-dir {{ module }} @@ -206,4 +214,8 @@ inject module: just server {{ module }} just client {{ module }} just result {{ module }} - just resultbrowser + +[doc("Copy build directory to injections/ with timestamp")] +[group("5: just do it")] +archive module suffix: + cp -rv {{ BUILD_DIR }}-{{ module }} ./injections/`date +%Y-%m-%d_%H-%M`_{{ module }}_"{{ suffix }}"