From 8c1239c71bb15758d4517257438e19223a414912 Mon Sep 17 00:00:00 2001 From: Thomas Walker Lynch Date: Wed, 16 Oct 2024 06:50:47 +0000 Subject: [PATCH] first block test passes, so work flow and framework are working --- developer/tool/make | 7 +++---- env_administrator | 5 +++++ env_developer | 5 +++++ env_tester | 6 +++++- release/Ariadne.jar | Bin 2741 -> 2741 bytes tester/document/about_TestBench.txt | 11 ++++------- tester/document/what_the_tests_do.txt | 3 ++- tester/javac/TestBench.java | 2 +- tester/javac/TestBenchAriadne.java | 4 ++-- tester/jvm/AriadnaTestBench.jar | Bin 2081 -> 0 bytes tester/jvm/TestBench.jar | Bin 2081 -> 0 bytes tester/jvm/TestBenchAriadne.jar | Bin 0 -> 3497 bytes tester/shell/.githolder | 0 tester/shell/TestBenchAriadne | 2 ++ tester/tool/clean | 21 --------------------- tester/tool/clean_build_directories | 22 ++++++++++++++++++++++ tester/tool/env | 2 +- tester/tool/make | 20 +++++++++++++++----- tester/tool/make_TestBench | 21 --------------------- tool_shared/bespoke/env | 4 ---- 20 files changed, 67 insertions(+), 68 deletions(-) delete mode 100644 tester/jvm/AriadnaTestBench.jar delete mode 100644 tester/jvm/TestBench.jar create mode 100644 tester/jvm/TestBenchAriadne.jar create mode 100644 tester/shell/.githolder create mode 100755 tester/shell/TestBenchAriadne delete mode 100755 tester/tool/clean create mode 100755 tester/tool/clean_build_directories delete mode 100755 tester/tool/make_TestBench diff --git a/developer/tool/make b/developer/tool/make index a8a9022..ab9c643 100755 --- a/developer/tool/make +++ b/developer/tool/make @@ -34,16 +34,15 @@ echo "Creating JAR file..." echo "Creating shell wrappers..." mkdir -p shell + # wrapper is a space separated list wrapper=build for file in $wrapper;do - - cat > shell/$file << EOL + cat > shell/$file << EOL #!/bin/bash java com/ReasoningTechnology/Ariadne/$file EOL chmod +x shell/$file - -done + done echo "$(script_fp) done." diff --git a/env_administrator b/env_administrator index 744a861..4b691ce 100644 --- a/env_administrator +++ b/env_administrator @@ -1,4 +1,9 @@ #!/usr/bin/env bash +script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")" +export REPO_HOME="${script_path%}/" +echo REPO_HOME "$REPO_HOME" + +cd "$REPO_HOME" source tool/env diff --git a/env_developer b/env_developer index 4236627..8659f86 100644 --- a/env_developer +++ b/env_developer @@ -1,5 +1,10 @@ #!/usr/bin/env bash +script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")" +export REPO_HOME="${script_path%}/" +echo REPO_HOME "$REPO_HOME" + +cd "$REPO_HOME" source tool_shared/bespoke/env source developer/tool/env diff --git a/env_tester b/env_tester index 969a5d1..d1bd2d5 100644 --- a/env_tester +++ b/env_tester @@ -1,5 +1,9 @@ #!/usr/bin/env bash +script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")" +export REPO_HOME="${script_path%}/" +echo REPO_HOME "$REPO_HOME" + +cd "$REPO_HOME" source tool_shared/bespoke/env source tester/tool/env - diff --git a/release/Ariadne.jar b/release/Ariadne.jar index 74faa320529c62592845fdf8fb42465e54f2d111..f2eb7a125019699975694f8bef89f7a0168bfd46 100644 GIT binary patch delta 93 zcmdlgx>b}nz?+#xgn@&DgCRveU?Q&-Gl=qf3!)}lF&cyE0!C{Py?Gs@7CTtrHire6 W7UNtArVnvCgJ}*fZ!jIk6%PPF%NQsC delta 93 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 diff --git a/tester/jvm/TestBenchAriadne.jar b/tester/jvm/TestBenchAriadne.jar new file mode 100644 index 0000000000000000000000000000000000000000..445ff47d340a2477d771e50e202ce3621070bf6d GIT binary patch literal 3497 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 shell/$file << EOL +#!/bin/env bash +java com.ReasoningTechnology.Ariadne.TestBench.$file +EOL + chmod +x shell/$file + done echo "$(script_fp) done." diff --git a/tester/tool/make_TestBench b/tester/tool/make_TestBench deleted file mode 100755 index dd5daa9..0000000 --- a/tester/tool/make_TestBench +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/env bash - -# input guards - - env_must_be="tester/tool/env" - if [ "$ENV" != "$env_must_be" ]; then - echo "$(script_fp):: error: must be run in the $env_must_be environment" - exit 1 - fi - -# the build -set -x - - cd $REPO_HOME/tester - - javac -d scratch_pad javac/TestBench.java - jar cf jvm/TestBench.jar -C scratch_pad . - -set +x - -echo "$(script_fp) done." diff --git a/tool_shared/bespoke/env b/tool_shared/bespoke/env index d38b1bc..f36023e 100644 --- a/tool_shared/bespoke/env +++ b/tool_shared/bespoke/env @@ -1,11 +1,8 @@ #!/usr/bin/env bash # environment shared by entire project - # number one task, establish REPO_HOME # this is specific to this script being in the .../tools_shared/env directory - script_path="$(dirname "$(realpath "${BASH_SOURCE[0]}")")" - export REPO_HOME="${script_path%/*/*}/" export PROJECT=$(basename "$REPO_HOME") ## set the shell prompt to show the project @@ -54,7 +51,6 @@ export JAVA_HOME="$REPO_HOME/tool_shared/third_party/jdk-11" # some feedback to show all went well echo ENV "$ENV" -echo REPO_HOME "$REPO_HOME" echo PROJECT "$PROJECT" -- 2.20.1