rm: rm3.sh now passes

.github/workflows/CICD.yml

@@ -138,20 +138,6 @@ jobs:
         # * convert any errors/warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
         S=$(cargo fmt -- --check) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s\n" "$S" | sed -E -n -e "s/^Diff[[:space:]]+in[[:space:]]+${PWD//\//\\/}\/(.*)[[:space:]]+at[[:space:]]+[^0-9]+([0-9]+).*$/::${fault_type} file=\1,line=\2::${fault_prefix}: \`cargo fmt\`: style violation (file:'\1', line:\2; use \`cargo fmt -- \"\1\"\`)/p" ; fault=true ; }
         if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
-    - name: "`cargo fmt` testing of integration tests"
-      if: success() || failure() # run regardless of prior step success/failure
-      shell: bash
-      run: |
-        ## `cargo fmt` testing of integration tests
-        unset fault
-        fault_type="${{ steps.vars.outputs.FAULT_TYPE }}"
-        fault_prefix=$(echo "$fault_type" | tr '[:lower:]' '[:upper:]')
-        # 'tests' is the standard/usual integration test directory
-        if [ -d tests ]; then
-          # * convert any errors/warnings to GHA UI annotations; ref: <https://help.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-a-warning-message>
-          S=$(find tests -name "*.rs" -print0 | xargs -0 cargo fmt -- --check) && printf "%s\n" "$S" || { printf "%s\n" "$S" ; printf "%s\n" "$S" | sed -E -n "s/^Diff[[:space:]]+in[[:space:]]+${PWD//\//\\/}\/(.*)[[:space:]]+at[[:space:]]+[^0-9]+([0-9]+).*$/::${fault_type} file=\1,line=\2::${fault_prefix}: \`cargo fmt\`: style violation (file:'\1', line:\2; use \`cargo fmt \"\1\"\`)/p" ; fault=true ; }
-        fi
-        if [ -n "${{ steps.vars.outputs.FAIL_ON_FAULT }}" ] && [ -n "$fault" ]; then exit 1 ; fi
 
   style_lint:
     name: Style/lint

.github/workflows/GnuComment.yml

@@ -0,0 +1,55 @@
+name: Comment on GNU test results on the PR
+
+# read-write repo token
+# access to secrets
+on:
+  workflow_run:
+    workflows: ["GnuTests"]
+    types:
+      - completed
+
+jobs:
+  upload:
+    runs-on: ubuntu-latest
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+    steps:
+      - name: 'Download artifact'
+        uses: actions/github-script@v3.1.0
+        with:
+          script: |
+            # List all artifacts from GnuTests
+            var artifacts = await github.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{github.event.workflow_run.id }},
+            });
+
+            # Download the "comment" artifact, which contains a PR number (NR) and result.txt
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "comment"
+            })[0];
+            var download = await github.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/comment.zip', Buffer.from(download.data));
+      - run: unzip comment.zip
+
+      - name: 'Comment on PR'
+        uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            var fs = require('fs');
+            var issue_number = Number(fs.readFileSync('./NR'));
+            await github.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: issue_number,
+              body: fs.readFileSync('./result.txt')
+            });

.github/workflows/GnuTests.yml

@@ -14,7 +14,8 @@ jobs:
     permissions:
       actions: read  # for dawidd6/action-download-artifact to query and download artifacts
       contents: read  # for actions/checkout to fetch code
-      pull-requests: read  # for dawidd6/action-download-artifact to query commit hash
+      issues: write # to publish comment
+      pull-requests: write  # for dawidd6/action-download-artifact to query commit hash & publish comment
     name: Run GNU tests
     runs-on: ubuntu-latest
     steps:
@@ -186,6 +187,15 @@ jobs:
         REF_LOG_FILE='${{ steps.vars.outputs.path_reference }}/test-logs/test-suite.log'
         REF_SUMMARY_FILE='${{ steps.vars.outputs.path_reference }}/test-summary/gnu-result.json'
         REPO_DEFAULT_BRANCH='${{ steps.vars.outputs.repo_default_branch }}'
+
+        mkdir -p ${{ steps.vars.outputs.path_reference }}
+
+        COMMENT_DIR="${{ steps.vars.outputs.path_reference }}/comment"
+        mkdir -p ${COMMENT_DIR}
+        echo ${{ github.event.number }} > ${COMMENT_DIR}/NR
+        COMMENT_LOG="${COMMENT_DIR}/result.txt"
+        touch ${COMMENT_LOG}
+
         if test -f "${REF_LOG_FILE}"; then
           echo "Reference SHA1/ID: $(sha1sum -- "${REF_SUMMARY_FILE}")"
           REF_ERROR=$(sed -n "s/^ERROR: \([[:print:]]\+\).*/\1/p" "${REF_LOG_FILE}" | sort)
@@ -195,28 +205,36 @@ jobs:
           for LINE in ${REF_FAILING}
           do
             if ! grep -Fxq ${LINE}<<<"${NEW_FAILING}"; then
-              echo "::warning ::Congrats! The gnu test ${LINE} is no longer failing!"
+              MSG="Congrats! The gnu test ${LINE} is no longer failing!"
+              echo "::warning ::$MSG"
+              echo $MSG >> ${COMMENT_LOG}
             fi
           done
           for LINE in ${NEW_FAILING}
           do
             if ! grep -Fxq ${LINE}<<<"${REF_FAILING}"
             then
-              echo "::error ::GNU test failed: ${LINE}. ${LINE} is passing on '${{ steps.vars.outputs.repo_default_branch }}'. Maybe you have to rebase?"
+              MSG="GNU test failed: ${LINE}. ${LINE} is passing on '${{ steps.vars.outputs.repo_default_branch }}'. Maybe you have to rebase?"
+              echo "::error ::$MSG"
+              echo $MSG >> ${COMMENT_LOG}
               have_new_failures="true"
             fi
           done
           for LINE in ${REF_ERROR}
           do
             if ! grep -Fxq ${LINE}<<<"${NEW_ERROR}"; then
-              echo "::warning ::Congrats! The gnu test ${LINE} is no longer ERROR!"
+              MSG="Congrats! The gnu test ${LINE} is no longer ERROR!"
+              echo "::warning ::$MSG"
+              echo $MSG >> ${COMMENT_LOG}
             fi
           done
           for LINE in ${NEW_ERROR}
           do
             if ! grep -Fxq ${LINE}<<<"${REF_ERROR}"
             then
-              echo "::error ::GNU test error: ${LINE}. ${LINE} is passing on '${{ steps.vars.outputs.repo_default_branch }}'. Maybe you have to rebase?"
+              MSG="GNU test error: ${LINE}. ${LINE} is passing on '${{ steps.vars.outputs.repo_default_branch }}'. Maybe you have to rebase?"
+              echo "::error ::$MSG"
+              echo $MSG >> ${COMMENT_LOG}
               have_new_failures="true"
             fi
           done
@@ -225,6 +243,11 @@ jobs:
           echo "::warning ::Skipping test failure comparison; no prior reference test logs are available."
         fi
         if test -n "${have_new_failures}" ; then exit -1 ; fi
+    - name: Upload comparison log (for GnuComment workflow)
+      uses: actions/upload-artifact@v3
+      with:
+        name: comment
+        path: ${{ steps.vars.outputs.path_reference }}/comment/
     - name: Compare test summary VS reference
       if: success() || failure() # run regardless of prior step success/failure
       shell: bash

build.rs

@@ -18,10 +18,6 @@ pub fn main() {
 
     let out_dir = env::var("OUT_DIR").unwrap();
     // println!("cargo:warning=out_dir={}", out_dir);
-    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap().replace('\\', "/");
-    // println!("cargo:warning=manifest_dir={}", manifest_dir);
-    let util_tests_dir = format!("{}/tests/by-util", manifest_dir);
-    // println!("cargo:warning=util_tests_dir={}", util_tests_dir);
 
     let mut crates = Vec::new();
     for (key, val) in env::vars() {
@@ -41,7 +37,6 @@ pub fn main() {
     crates.sort();
 
     let mut mf = File::create(Path::new(&out_dir).join("uutils_map.rs")).unwrap();
-    let mut tf = File::create(Path::new(&out_dir).join("test_modules.rs")).unwrap();
 
     mf.write_all(
         "type UtilityMap<T> = phf::Map<&'static str, (fn(T) -> i32, fn() -> Command<'static>)>;\n\
@@ -60,42 +55,15 @@ pub fn main() {
             "uu_test" => {
                 phf_map.entry("test", &map_value);
                 phf_map.entry("[", &map_value);
-
-                tf.write_all(
-                    format!(
-                        "#[path=\"{dir}/test_test.rs\"]\nmod test_test;\n",
-                        dir = util_tests_dir,
-                    )
-                    .as_bytes(),
-                )
-                .unwrap();
             }
             k if k.starts_with(OVERRIDE_PREFIX) => {
                 phf_map.entry(&k[OVERRIDE_PREFIX.len()..], &map_value);
-                tf.write_all(
-                    format!(
-                        "#[path=\"{dir}/test_{k}.rs\"]\nmod test_{k};\n",
-                        k = &krate[OVERRIDE_PREFIX.len()..],
-                        dir = util_tests_dir,
-                    )
-                    .as_bytes(),
-                )
-                .unwrap();
             }
             "false" | "true" => {
                 phf_map.entry(
                     krate,
                     &format!("(r#{krate}::uumain, r#{krate}::uu_app)", krate = krate),
                 );
-                tf.write_all(
-                    format!(
-                        "#[path=\"{dir}/test_{krate}.rs\"]\nmod test_{krate};\n",
-                        krate = krate,
-                        dir = util_tests_dir,
-                    )
-                    .as_bytes(),
-                )
-                .unwrap();
             }
             "hashsum" => {
                 phf_map.entry(
@@ -123,33 +91,14 @@ pub fn main() {
                 phf_map.entry("shake256sum", &map_value_bits);
                 phf_map.entry("b2sum", &map_value);
                 phf_map.entry("b3sum", &map_value_b3sum);
-                tf.write_all(
-                    format!(
-                        "#[path=\"{dir}/test_{krate}.rs\"]\nmod test_{krate};\n",
-                        krate = krate,
-                        dir = util_tests_dir,
-                    )
-                    .as_bytes(),
-                )
-                .unwrap();
             }
             _ => {
                 phf_map.entry(krate, &map_value);
-                tf.write_all(
-                    format!(
-                        "#[path=\"{dir}/test_{krate}.rs\"]\nmod test_{krate};\n",
-                        krate = krate,
-                        dir = util_tests_dir,
-                    )
-                    .as_bytes(),
-                )
-                .unwrap();
             }
         }
     }
     write!(mf, "{}", phf_map.build()).unwrap();
     mf.write_all(b"\n}\n").unwrap();
 
     mf.flush().unwrap();
-    tf.flush().unwrap();
 }