From: Thomas Walker Lynch Date: Sat, 7 Dec 2024 17:08:04 +0000 (+0000) Subject: working again after the arrival of pencils X-Git-Url: https://git.reasoningtechnology.com/style/static/gitweb.css?a=commitdiff_plain;h=0c16483bbb5fd3806d83d262c0ecd12d1e3101e9;p=Mosaic working again after the arrival of pencils --- diff --git a/#README.txt# b/#README.txt# new file mode 100644 index 0000000..2381746 --- /dev/null +++ b/#README.txt# @@ -0,0 +1,24 @@ + +-------------------------------------------------------------------------------- +Mosaic + +A tool to assist in hierarchical white box testing. + +Each piece of a program must have integrity for the complete picture to emerge. + +With Mosaic we test the pieces, then the communication between the pieces. + +-------------------------------------------------------------------------------- +Install + +After cloning the project, check the tool_shared/third_party directory for +installation instructions for version specific required tools. + +Even if you do not plan to do development or testing on Mosaic, but merely plan +to use the ready made tools found in the release directory, Install RT_incommon +to complete some of the symbolic links and to bring in more documents and +scripts. + + + + diff --git a/LICENSE.txt b/LICENSE.txt index 98f0753..6a14e2c 120000 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1 +1 @@ -document/license.txt \ No newline at end of file +document🖉/license.txt \ No newline at end of file diff --git a/README.txt b/README.txt index 06fa5f4..0264911 120000 --- a/README.txt +++ b/README.txt @@ -1 +1 @@ -document/readme.txt \ No newline at end of file +document🖉/readme.txt \ No newline at end of file diff --git "a/developer/tool\360\237\226\211/clean_build_directories" "b/developer/tool\360\237\226\211/clean_build_directories" index 7091d81..b03a6a9 100755 --- "a/developer/tool\360\237\226\211/clean_build_directories" +++ "b/developer/tool\360\237\226\211/clean_build_directories" @@ -7,7 +7,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # directory instead of putting them in `shell`. # input guards - env_must_be="developer/tool/env" + env_must_be="developer/tool🖉/env" if [ "$ENV" != "$env_must_be" ]; then echo "$(script_fp):: error: must be run in the $env_must_be environment" exit 1 @@ -16,9 +16,9 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # remove files set -x cd "$REPO_HOME"/developer - rm -r scratchpad/* - rm jvm/* - rm shell/* + rm_na -r scratchpad/* + rm_na jvm/* + rm_na shell/* set +x echo "$(script_fn) done." diff --git "a/developer/tool\360\237\226\211/env" "b/developer/tool\360\237\226\211/env" index 79434ec..630b7f6 100644 --- "a/developer/tool\360\237\226\211/env" +++ "b/developer/tool\360\237\226\211/env" @@ -20,8 +20,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # so we can do the build export PATH=\ -"$REPO_HOME"/developer/tool/\ -:"$REPO_HOME"/tool_shared/bespoke/\ +"$REPO_HOME"/developer/tool🖉/\ :"$JAVA_HOME"/bin\ :"$PATH" @@ -34,7 +33,7 @@ export CLASSPATH=\ :"$CLASSPATH" export PATH=\ -"$REPO_HOME"/developer/shell\ +"$REPO_HOME"/developer/bash\ :"$PATH" # misc diff --git "a/developer/tool\360\237\226\211/make" "b/developer/tool\360\237\226\211/make" index be84a0e..9bc03e2 100755 --- "a/developer/tool\360\237\226\211/make" +++ "b/developer/tool\360\237\226\211/make" @@ -3,7 +3,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # input guards - env_must_be="developer/tool/env" + env_must_be="developer/tool🖉/env" if [ "$ENV" != "$env_must_be" ]; then echo "$(script_fp):: error: must be run in the $env_must_be environment" exit 1 diff --git "a/developer/tool\360\237\226\211/release" "b/developer/tool\360\237\226\211/release" index bcf4686..43d2d9f 100755 --- "a/developer/tool\360\237\226\211/release" +++ "b/developer/tool\360\237\226\211/release" @@ -8,7 +8,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") exit 1 fi - env_must_be="developer/tool/env" + env_must_be="developer/tool🖉/env" if [ "$ENV" != "$env_must_be" ]; then echo "$(script_fp):: error: must be run in the $env_must_be environment" exit 1 diff --git "a/developer/tool\360\237\226\211/shell_wrapper_list" "b/developer/tool\360\237\226\211/shell_wrapper_list" index c95affe..22e5ed2 100755 --- "a/developer/tool\360\237\226\211/shell_wrapper_list" +++ "b/developer/tool\360\237\226\211/shell_wrapper_list" @@ -3,7 +3,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # input guards - env_must_be="developer/tool/env" + env_must_be="developer/tool🖉/env" if [ "$ENV" != "$env_must_be" ]; then echo "$(script_fp):: error: must be run in the $env_must_be environment" exit 1 diff --git "a/document\360\237\226\211/readme.txt" "b/document\360\237\226\211/readme.txt" index 4a42a93..3ef42b5 100644 --- "a/document\360\237\226\211/readme.txt" +++ "b/document\360\237\226\211/readme.txt" @@ -8,3 +8,14 @@ Each piece of a program must have integrity for the complete picture to emerge. With Mosaic we test the pieces, then the communication between the pieces. +-------------------------------------------------------------------------------- +Install + +After cloning the project, check the tool_shared/third_party directory for +installation instructions for version specific required tools. Install +RT_incommon to complete some of the symbolic links and to bring in more +documents and scripts. + + + + diff --git "a/document\360\237\226\211/see_also" "b/document\360\237\226\211/see_also" new file mode 120000 index 0000000..afbcbfb --- /dev/null +++ "b/document\360\237\226\211/see_also" @@ -0,0 +1 @@ +../tool_shared/third_party/RT-incommon/document🖉/ \ No newline at end of file diff --git a/release/Mosaic.jar b/release/Mosaic.jar index e264a8a..a0efc57 100644 Binary files a/release/Mosaic.jar and b/release/Mosaic.jar differ diff --git a/tester/bash/Test0 b/tester/bash/Test0 deleted file mode 100755 index 5b3584f..0000000 --- a/tester/bash/Test0 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/env bash -java Test0 diff --git a/tester/bash/Test_IO b/tester/bash/Test_IO deleted file mode 100755 index 72977e7..0000000 --- a/tester/bash/Test_IO +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/env bash -java Test_IO diff --git a/tester/bash/Test_MockClass_0 b/tester/bash/Test_MockClass_0 deleted file mode 100755 index d24ad96..0000000 --- a/tester/bash/Test_MockClass_0 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/env bash -java Test_MockClass_0 diff --git a/tester/bash/Test_Testbench b/tester/bash/Test_Testbench deleted file mode 100755 index b46456c..0000000 --- a/tester/bash/Test_Testbench +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/env bash -java Test_Testbench diff --git a/tester/bash/Test_Util b/tester/bash/Test_Util deleted file mode 100755 index 0e4ba3d..0000000 --- a/tester/bash/Test_Util +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/env bash -java Test_Util diff --git a/tester/bash/test_log.txt b/tester/bash/test_log.txt deleted file mode 100644 index fcb2724..0000000 --- a/tester/bash/test_log.txt +++ /dev/null @@ -1,14 +0,0 @@ - -2024-11-08T09:58:55.370638Z ----------------------------------------------------------- -Test: test_failure_3 -Stream: stdout -Output: -Intentional extraneous chars to stdout for testing - - -2024-11-08T09:58:55.380370Z ----------------------------------------------------------- -Test: test_failure_4 -Stream: stderr -Output: -Intentional extraneous chars to stderr for testing. - diff --git a/tester/jvm/Test_Mosaic.jar b/tester/jvm/Test_Mosaic.jar deleted file mode 100644 index 71d53de..0000000 Binary files a/tester/jvm/Test_Mosaic.jar and /dev/null differ diff --git "a/tester/tool\360\237\226\211/clean_build_directories" "b/tester/tool\360\237\226\211/clean_build_directories" index 5b84fd0..11c7909 100755 --- "a/tester/tool\360\237\226\211/clean_build_directories" +++ "b/tester/tool\360\237\226\211/clean_build_directories" @@ -7,7 +7,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # directory. # input guards - env_must_be="tester/tool/env" + 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 @@ -16,9 +16,9 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # remove files set -x cd "$REPO_HOME"/tester - rm -r scratchpad/* - rm jvm/* - rm shell/* + rm_na -r scratchpad/* + rm_na jvm/* + rm_na bash/* set +x echo "$(script_fn) done." diff --git "a/tester/tool\360\237\226\211/env" "b/tester/tool\360\237\226\211/env" index 1c8ed7e..9ff8086 100644 --- "a/tester/tool\360\237\226\211/env" +++ "b/tester/tool\360\237\226\211/env" @@ -20,8 +20,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # so we can do testing export PATH=\ -"$REPO_HOME"/tester/tool/\ -:"$REPO_HOME"/tool_shared/bespoke/\ +"$REPO_HOME"/tester/tool🖉/\ :"$JAVA_HOME"/bin\ :"$PATH" @@ -32,6 +31,7 @@ export CLASSPATH=\ :"$CLASSPATH" export SOURCEPATH=\ +"$REPO_HOME"/tester/bash\ "$REPO_HOME"/tester/javac/\ :"$REPO_HOME"/developer/scratchpad/\ diff --git "a/tester/tool\360\237\226\211/make" "b/tester/tool\360\237\226\211/make" index deae0a1..208421a 100755 --- "a/tester/tool\360\237\226\211/make" +++ "b/tester/tool\360\237\226\211/make" @@ -3,7 +3,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # input guards - env_must_be="tester/tool/env" + 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 @@ -13,20 +13,20 @@ echo "Compiling files..." set -x cd $REPO_HOME/tester - javac -g -d scratchpad javac/*.java + javac -g -d scratchpad javac🖉/*.java jar cf jvm/Test_"$PROJECT".jar -C scratchpad . set +x echo "Creating shell wrappers..." - mkdir -p shell + mkdir -p bash # wrapper is a space separated list wrapper=$(shell_wrapper_list) for file in $wrapper;do - cat > shell/$file << EOL + cat > bash/$file << EOL #!/bin/env bash java $file EOL - chmod +x shell/$file + chmod +x bash/$file done echo "$(script_fp) done." diff --git "a/tester/tool\360\237\226\211/run_tests" "b/tester/tool\360\237\226\211/run_tests" index 1e7182b..1ca7382 100755 --- "a/tester/tool\360\237\226\211/run_tests" +++ "b/tester/tool\360\237\226\211/run_tests" @@ -7,7 +7,7 @@ if [ -z "$REPO_HOME" ]; then fi # Navigate to the shell directory -cd "$REPO_HOME/tester/shell" || exit +cd "$REPO_HOME/tester/bash" || exit # Get the list of test scripts in the specific order from shell_wrapper_list test_list=$(shell_wrapper_list) diff --git "a/tester/tool\360\237\226\211/shell_wrapper_list" "b/tester/tool\360\237\226\211/shell_wrapper_list" index 29dd738..b46116b 100755 --- "a/tester/tool\360\237\226\211/shell_wrapper_list" +++ "b/tester/tool\360\237\226\211/shell_wrapper_list" @@ -2,7 +2,7 @@ script_afp=$(realpath "${BASH_SOURCE[0]}") # input guards -env_must_be="tester/tool/env" +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 diff --git "a/tool_shared/bespoke\360\237\226\211/env" "b/tool_shared/bespoke\360\237\226\211/env" index 6efefc2..3ed782f 100644 --- "a/tool_shared/bespoke\360\237\226\211/env" +++ "b/tool_shared/bespoke\360\237\226\211/env" @@ -26,14 +26,24 @@ fi # set the prompt decoration to the name of the project PROMPT_DECOR=$PROJECT + # include the project bespoke tools + PATH="$REPO_HOME"/tool_shared/bespoke🖉:"$PATH" + + export REPO_HOME PROJECT PROMPT_DECOR PATH + # -------------------------------------------------------------------------------- # The project administrator sets up the following tools for all roles to use: # - export PATH="$REPO_HOME/tool_shared/third_party/RT-incommon/release/bash:$PATH" - export PATH="$REPO_HOME/tool_shared/third_party/RT-incommon/release/amd64:$PATH" - export JAVA_HOME="$REPO_HOME/tool_shared/third_party/jdk-23.0.1:$PATH" - export PATH="$REPO_HOME/tool_shared/third_party/emacs/bin:$PATH" -# export PATH="$REPO_HOME/tool_shared/third_party/idea-IC-243.21565.193/:$PATH" + PATH="$REPO_HOME/tool_shared/third_party/RT-incommon/release/bash:$PATH" + PATH="$REPO_HOME/tool_shared/third_party/RT-incommon/release/amd64:$PATH" + PATH="$REPO_HOME/tool_shared/third_party/emacs/bin:$PATH" + +# after having installed Itellij IDEA +# PATH="$REPO_HOME/tool_shared/third_party/idea-IC-243.21565.193/:$PATH" + + JAVA_HOME="$REPO_HOME/tool_shared/third_party/jdk-23.0.1" + + export PATH JAVA_HOME # -------------------------------------------------------------------------------- # the following functions are provided for other scripts to use. @@ -61,7 +71,6 @@ fi # Bash has no 'closure' hence when exporting a function, one must also export all the pieces. # do not export script_afp - export REPO_HOME PROJECT PROMPT_DECOR export -f script_adp script_fn script_dp script_fp export ENV=$(script_fp)