From 0c16483bbb5fd3806d83d262c0ecd12d1e3101e9 Mon Sep 17 00:00:00 2001 From: Thomas Walker Lynch Date: Sat, 7 Dec 2024 17:08:04 +0000 Subject: [PATCH] working again after the arrival of pencils --- #README.txt# | 24 ++++++++++++++++++ LICENSE.txt | 2 +- README.txt | 2 +- .../clean_build_directories" | 8 +++--- "developer/tool\360\237\226\211/env" | 5 ++-- "developer/tool\360\237\226\211/make" | 2 +- "developer/tool\360\237\226\211/release" | 2 +- .../tool\360\237\226\211/shell_wrapper_list" | 2 +- "document\360\237\226\211/readme.txt" | 11 ++++++++ "document\360\237\226\211/see_also" | 1 + release/Mosaic.jar | Bin 9222 -> 9222 bytes tester/bash/Test0 | 2 -- tester/bash/Test_IO | 2 -- tester/bash/Test_MockClass_0 | 2 -- tester/bash/Test_Testbench | 2 -- tester/bash/Test_Util | 2 -- tester/bash/test_log.txt | 14 ---------- tester/jvm/Test_Mosaic.jar | Bin 7683 -> 0 bytes .../clean_build_directories" | 8 +++--- "tester/tool\360\237\226\211/env" | 4 +-- "tester/tool\360\237\226\211/make" | 10 ++++---- "tester/tool\360\237\226\211/run_tests" | 2 +- .../tool\360\237\226\211/shell_wrapper_list" | 2 +- "tool_shared/bespoke\360\237\226\211/env" | 21 ++++++++++----- 24 files changed, 75 insertions(+), 55 deletions(-) create mode 100644 #README.txt# create mode 120000 "document\360\237\226\211/see_also" delete mode 100755 tester/bash/Test0 delete mode 100755 tester/bash/Test_IO delete mode 100755 tester/bash/Test_MockClass_0 delete mode 100755 tester/bash/Test_Testbench delete mode 100755 tester/bash/Test_Util delete mode 100644 tester/bash/test_log.txt delete mode 100644 tester/jvm/Test_Mosaic.jar 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 e264a8a446390e228f003f7dfdc57b5d1f4f91b5..a0efc574ff7f486f700bdb3ebed573ec2349c9c9 100644 GIT binary patch delta 102 zcmZqkX!GC+@MdNaVc_84U~o2?$YagqY_!ockr7C3Uc=bV2BJ+lrZ9o%(_CvfL3E`^ l4-b%@%&uq&;yNkXf|O5gREh#oca`Eml&x|ih+3eW1^@;G8l3Bkr7C3Uc=bV2BJ+lrZ9o%(_CvfL3E`^ l4-b%@%&uq&;yNkXf|O5gREh#oca`Eml&x|ih+3eW1^`$c7To{< 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 71d53deed1ff8e84513edab7bfb26c2b31042edf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7683 zcmaJ`1z42bwgw4-p(Lcc8>Ky=Toc^Xz%Pz1Hm6&)VzV?|PNxQBaAHFfcHXw3V#1k$y8wBvd2?X>}kMNKuC8 zXCD$03X-z?eT=&q_x_%y{Qo)=-Ol)rvjR{NBqOb+&aEKxO<|z_r92n+D2_ZA`_RB} zl`8K9-|~htx10heNMY2is9Keme}Zp>k6&%XNnxm$lT}f}>18huYcJ>Em-UU+jeCDB zLcxVJ`T6Zn0B_&F7U5^4^pAglb^Dat(%RM9(!tT$e0)`PVoH9Pv-jn2Kabqsfq0^3 zc^}+P!}~{|KeqyK`&8ZB#g&)a)Xvz&#VvlpnMj(b+n4F#pq-DmEM~1eKC_yuhk!N?i`>Mx z3|)U8KJ>pgb-`{1!IONFid-5ix*z*ZkClPM)^4QGnQi?sjb^Ry&!@?JgnG+0!uTU|K%2};Lc%Nv~&Yz~+;!t!{L0^01HKY1(kB58Fc zn=Li2*FT859wQeANhmWDL(<9^d<2E8TX!#2yjt-eGUtV)=*<~_IQRrZlqcbQ11|}f zTW0TC<)TWbFPn9B`_d2m=r-tj%z>OK<2n<09!Y^L#PAdWpmS#2#Y+U80NYB#=6o+6 z`+kg&q>*a+R2U{UPt49um+qVI?0-`cU5fuiqgQ#!9}K@VI#!;0CAj5Vpb?kPynncL zu9C{6edC2N&}1cyiD^D81)(Z2g^&1}+I8zJ^zM!R{OVSFvf_TWjFa1p2>F82-XE$7 z7Tx64M$FCU!7W`%(e;guCBYcD{aW!5iGiCE6$w7gqcq)8ee#Kv{A=GlJ=_k;5g>ln z*iW1bv}6xJQ*WKn>t1-!!WU*6iZZ;dKpYtVFAEBk6-Lzdb z>_;8>EL!+TZG>%Se!P+6H5AX;Y-M#^c_46zwk*<7r5-54KET&W?*;)IrwC|TIYm4y z$QU<=esqc+FA+tt^qlj0vgX^r#D8xxn0%N2bISqkkd}Sdz~)Za))#DxuK@zSlZ9iR zh04wu8~Q?hScf8LD}Haq&Uo(5Xi(MFSjO!kHAVgXc>I~wIDcogAxP<8c^&m$UyD$S zC^R!6#Vno|88ae6{nI3Q5IIK}23X}<4p{|QGAsACmkv8LMVPN*_OQ%wq<^v6W6?>C zhrU>UAMfb!1YYc#0bj!3y0(2VcWDc4gwztV5GQ;~gcE4ooR(yZih!&a&+u z3G-@&5^~2CqMj0iUYj^iAC;qqt8}|{oT2H!JQTBHe3;m*(p>etO5v5XKeTPL>Ct9D z!*F&N$l*sn!ii2M7W_PBOLP1ok^))OSre|vcw)3ybH(-9&xp_@vD_87bz@2-KRNe@ z$j8`g<4_G#JutJ7?0?N`u90Rf(7K6b63x=1G`lFb0^6T~Qk|q%wwjnp1Z`?_ z-rF4em{BQSyZ$jRDC10!xN+Hw*t$>^(-6HzjmIk>}#E< zg>x)5%3NMBzjmHox!GzgA6U@q*(WnJwyo(EF z#Hd)}FlYaMk9)b>1bfq4w%*3tvnvm+pk7{S*(^X-E!5Nk*J<_iHDcIRG{sPGOSPuV zd-(j|P>yb?y|5TO5Uqiybc`7R4G!|u*hlqt&|`a+(86O?EGWr&)n4K_qZ)f+-upF| z&3(hWme{I62LRcm($Ge;FDr*vVj~j0?T2yl*_&MC8`Mg4$c8D)YSXlsEZ&t!z~wf^cXxcsdsrB#_`?#i*H~Si6fdN*hQtD9FqU}_ z@3G~7-CQB*qF*}UGZ`M)*^-zHZ>+Oz5o6qf< zO>HIjPR)pvoNfDj--9tvkQ^#r2W3l0Po>gj_}T8kst_!Xhr`UzCb!455^Ks7li*l` zaXjTH(@OCuX2MdC&OJI=A-@x+_ohT!2vpM(mkgi<+3HhEuvs#bOrf)2j&Xo62*T!c zuZPwvCIO=%B{%cQBk#I)q=Jzx1m&A_$(R@9&vY$=>VSRA)x4ySN$H_`ZcJgNbx^yC z7$Qqjhn+QopyY-+fd<*L(yx=DZ91blbZ(zP&R;j83U#TC`3VfutJWF(T4*xrSE54#x;rFw(c@H zM=mgiqDpGN3|!@mt$D`l6F|@-iJ2e54WoxqJ&=B^qq@~{nD4i5I5Gtx!&bAHJ^QKh z644j^DxEhkqh(7DLG6d|fcV_JzV6O!qkHXO&O#DzR-e3%odAL+PbPz$*g)x8I`so~ zK^!21jiO6WuJ&C_7*qWa1-T>pxGrecQ&${o=c{7;s}oe0zHa3h3d}s6ckEJZ?M*o; zea>p)5BWKxq=D}w9KC(e(NcOj#=Zg6qAPeEwm)c*4ghqbQ{me*B(9s9j%RwrU7s^3 zR7V7@XPrgC=?MqKenatC2+{^O4G)Fy`h1_&d4a`}gXmBmv_i}|h(p->4@PrEygoZa zUhOU|vs^n+;<`#+R^hlb{`60Q{iGJ0G(=XR(sP4$%xmXmz-q)Ju}*i|KDjBk`MoBGrSg}Jc_Z@VhtRq~s`jJ48$Yeud_qrcQv;9Yl0!4`n^3~@ zsAo}Us!hYH5qLz#W>l!#4N<`;LAc}GJf;Y9IO#b#4fH&W3D{kPTX3GN^!`{$&G$2c ztwnj`BEAf@*JOE03VN=y@7GxygrhXjOSHsxc6hN8-srkOBvHh8P~`tw^~TQca)!8C zX!r+~n%e{siA@ZJ=VsKcRe1y#n_BlOFjk$%fQ5i57vHnuZXrFu5t>^+_LVjQEYV zG@f8CEg{GPskfx|Zg%bZ5d%$uMVTItZ%G1*Y*^{TV$71*^pGMU7t4HPTUj@L5SVS&q zebuA_voe1OERxcnM99(*{3wmK0V1W5^L`a&9zsT!9H4zZm^}U5WH9-_(kOIBiLr~4 zMd!*H z+XBlxrD#jBAaS(C=Ru2Zop`VVMZ2g2N>3SWyf2SD!U^s>`=z*sAgD*(_o?^swvu3nOeXCyQ1Xs`{`4PQq z+zN(Q&K^^rN_2=db(w9W5~EpU;ijwRi&KrQ)ScpTuLg-Kb8R)lkb@t@@Sl>p9-MkL z(`8+dw}P{@r;M12ahv>PpJ#^1++V?gdtm)Nu!3FcYsFX=$xy%aby5|0Rg_xx^!PKe zxb8@sNZa&LVHefJvppR)yPhY8#=3?f`|Kf9<3Dz;3=5nBQAt32pinkA-ypZe&oiQ& zbimd1V??K0(BiCHRRX3r{>@*k%4?;S^f4L|()umm`Ty(h!~diH{>_VGb(IKJh(cNy z6m>--_44USkfrUA*$fD1Y&_{6S&vP2O_H0KWJI%UEW0ufeQFy%#-tCIXrnP7z>bnC zLYQY(ood_e*ZBXu{E6b(?vg-ni#Dn77_`7!Ka4{7Mj_#?UCNUjy)1enG4{yWis<)7 zU&NKr-omIt*@=#MY6@~u=yYMOXlo-kdBNMEr|KNkry3&_S1^K2@)pxZeX)^VA5`+u z3fu&PoF&`KA%uEuts!A#cBy!_`s*d(iq=_;sZ;bX?nG9O%JLa|M)+9YZma+z64C0k z>m9|}TAwKeZ={MaFP?=|P++Q(48UpbM|hgLAo0EA+$w_O#V!c#gVO*@lBtc9qMnSo*?)XNV#g_M@|uld&d}!1s$bd`hR? zLQ0+2n5#6&-Uf#ppN}QfXj1uu{c`t4&Z>pBSP|3T^!=SQ?Ju)SGgP*j=39=_P3b7Q z42pyt^lms_TyaKDDDzGfMx*BHmATH)K95^Bi#3bGP~7ER5trC$8gMsj$Zy6w7HdTw??pLh1d$3Z*(~xTmWF*FD7}Zw+rb(c1+2V569yi zH;sxZ96n8a2zVcW`LMo|QW7&k`XJsog;Jg~fvI1vsJ>6U?HO+}>c9yEv~#Q*ejghIbz(<_@M-|4OF(#5oVbDdNxmx+F1-%z}`1Ho^9s5U?OA zFc1n+Sk&coap_{HmgncN(C`gT)2B?n_2e;6o=<2|)=??gn6KY&idK;=BHmz6 zv7z;+e~#k+HvjUgaj5QlH9hS4hmX6Gv3w=^VzJ#HJ$w@oqqhDghNeK6o^?ppvP;2K+A6 z7JX^IGq}~nyQ6(9==fT$oRh7wL6s=<$8uiwHF1IFqvk#obM5}G-N;G_=HsjqBv}PK zr+Nz0fvbPvk%H&Y$_X#7ICZks7IDORT^ef$_>E)InnD>OTSXtO)KogEYat>nbff*K z{S--g_hV1EHfr^J-gz66uEF=@>O?qBrgWk{d*`FblSU8CVh{@jPs0_jd7QbiUe%hv z#mpo=fv$KJJv2aI5>RqcKx~V<(-^qRS$Pi_Yt+4a2@fzgms&x-jF7R9KZ+p$shh$?(VG`O3A; zQ_u_pYYsXcUpF|XG{(7ENE#MzL-jE)v(n%_EDQisZn0g$Ehtyxjf^~jRn_zAFbvc zsZjxxL5iYXX?7-`Nz&ao8!T8##avdKgFiUc@$nNth23RGCb5h2H!d+;Rx4*0W!L{Oe)<8Ps)>Snh-*Km5AV_aquBB8Y*)9+Hh=H04Ynr zhppIzfW^huUe;J#C|K% zF%_Oj54XU9j)IVVpTOyMhc4BXU3eHyJZk8RSMM2`+F84M_$n0+Fq(ZO7?TcZg(}kY z#OXa=r_CpDIWJ6HrcUo$o@A0QF*a(|C_2a4IF1do=B{_T?tK)T*4&>9!z6)+H%A3` z#fKktEC?uLwBKiV>yCrk$hSXM--9>HOVat`6fzoui!l=#D<~y;e)td=CX+6Fl;rv7 z>4iY=+%RdfSaWYS4(?6HiRn7P`^`MA!^jnQ{e-!!)#`ExzTNWB8-q?9^>u*bb(_WA{L+aO10J7>>? zI4VD%=QW!krvxGz_pS6zeeSnO%=H8Y zY5oMEX&0+-mzd^xW6ZS7C&~UZ3`xgo{C(bz%$`XC{?>6wUw^VRIebF}0 z6OGCEs;(N8H7_s6P4pHi+rHryq6Xz*kkWtOOtNCK&6q@ z_?Ajetv2`-qcmN45cDM-%O#bM&LGAK5{K`|dZZUT9=Q{_9SLYR7PA$TMe}d+ksDFm z+~mymni$eqlLu63z8*^-1WV3Yaobx!2bxMhn=8A(=FqaOUB}pk`ADe5_!xsJ1$g<$ zvKbb|y*rz%Pb~)ad=JC*xJ^@L=;-2y%n^3oL*`e(HCo~#?M)isK4Hnmg8F*$9RJU~ zJlc}-IL?CuL?t?^l`m~dfqJT~_aP^3=r$FBMUE~waOY6u7%P;hTq^t=w(gg$LKfT& zSH*;cv+Ru`YUSyD4U_7AmXF=rAL#6Yndp9At4=EHhGlUjyK90;$`*FtC)8Gbd+snh zcc=c=dSz3-cSoehCgEk?r&CT$l0HLstJx?eL~n9vNJ(dVcSes{$iLBpQ;T=s^+N6Rtg(i& zY_3r?i|+7P&_aHJjc<*aeo>rjOX!Q$YHD9cb*-VRbm~-hb9885l1k=IDlyc7gwhsx zgn&?H=dL>Qka}LmYM-{CmX9(iC8BjWJ6#RtVnGjSwm+CqlvZcI21=Pz zWut6KlAq|J*U@B0T)ka=9p>Kj0KkD4 zM4s=IxxiOEVgm3hDefOE?@4^+svorLevu#dqo2B|>CV4te^c(=+UK#X&wmynHhPp^ z)X0^5#In$E_|ht0QJy}wr1c0A(@uVUusL9I?C{*l#t1Uw3C5bmuqs2-_$OsgwUzux51S2UFKq=~U@iZxa|r z25BuxH#rMP3)%6Unq<7dY)U&P!I%kVS)AAWK}sp_`0*S$$11OT65Y)xqcA1YJ=S0x zaUyL%Hw#Rsu+9UDi-_H`9f`XF>eJb_f_hs(m;a(>$oGhl{wdo1TamjH?fz;1QQ__+ zJZ1TRy8f=C-Ce|gnfUGSKd!$Cc)v%u)7yR*(C+lMU)FIu{H4DA?swPG`(2{Alh=M3 z0Qnzc+n4O JRTOvM{s-y8re**D 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) -- 2.20.1