Merge branch 'main' into cp-refactor-copy-direntry

uutils · Sep 18, 2022 · d2543cd · d2543cd
2 parents a78755f + f8c9de7
commit d2543cd
Show file tree

Hide file tree

Showing 20 changed files with 2,210 additions and 1,591 deletions.
diff --git a/.github/workflows/GnuTests.yml b/.github/workflows/GnuTests.yml
@@ -34,12 +34,13 @@ jobs:
  outputs repo_default_branch repo_GNU_ref repo_reference_branch
  #
  SUITE_LOG_FILE="${path_GNU_tests}/test-suite.log"
+ ROOT_SUITE_LOG_FILE="${path_GNU_tests}/test-suite-root.log"
  TEST_LOGS_GLOB="${path_GNU_tests}/**/*.log" ## note: not usable at bash CLI; [why] double globstar not enabled by default b/c MacOS includes only bash v3 which doesn't have double globstar support
  TEST_FILESET_PREFIX='test-fileset-IDs.sha1#'
  TEST_FILESET_SUFFIX='.txt'
  TEST_SUMMARY_FILE='gnu-result.json'
  TEST_FULL_SUMMARY_FILE='gnu-full-result.json'
- outputs SUITE_LOG_FILE TEST_FILESET_PREFIX TEST_FILESET_SUFFIX TEST_LOGS_GLOB TEST_SUMMARY_FILE TEST_FULL_SUMMARY_FILE
+ outputs SUITE_LOG_FILE ROOT_SUITE_LOG_FILE TEST_FILESET_PREFIX TEST_FILESET_SUFFIX TEST_LOGS_GLOB TEST_SUMMARY_FILE TEST_FULL_SUMMARY_FILE
  - name: Checkout code (uutil)
  uses: actions/checkout@v3
  with:
@@ -82,8 +83,13 @@ jobs:
  ## Some tests fail with 'cannot change locale (en_US.ISO-8859-1): No such file or directory'
  ## Some others need a French locale
  sudo locale-gen
- sudo locale-gen fr_FR
- sudo locale-gen fr_FR.UTF-8
+ sudo locale-gen --keep-existing fr_FR
+ sudo locale-gen --keep-existing fr_FR.UTF-8
+ sudo locale-gen --keep-existing sv_SE
+ sudo locale-gen --keep-existing sv_SE.UTF-8
+ sudo locale-gen --keep-existing en_US
+ sudo locale-gen --keep-existing ru_RU.KOI8-R
+
  sudo update-locale
  echo "After:"
  locale -a
@@ -99,6 +105,12 @@ jobs:
  path_GNU='${{ steps.vars.outputs.path_GNU }}'
  path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
  bash "${path_UUTILS}/util/run-gnu-test.sh"
+ - name: Run GNU root tests
+ shell: bash
+ run: |
+ path_GNU='${{ steps.vars.outputs.path_GNU }}'
+ path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
+ bash "${path_UUTILS}/util/run-gnu-test.sh" run-root
  - name: Extract testing info into JSON
  shell: bash
  run : |
@@ -108,18 +120,17 @@ jobs:
  id: summary
  shell: bash
  run: |
+ path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
  ## Extract/summarize testing info
  outputs() { step_id="summary"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
  #
  SUITE_LOG_FILE='${{ steps.vars.outputs.SUITE_LOG_FILE }}'
+ ROOT_SUITE_LOG_FILE='${{ steps.vars.outputs.ROOT_SUITE_LOG_FILE }}'
+ ls -al ${SUITE_LOG_FILE} ${ROOT_SUITE_LOG_FILE}
+
  if test -f "${SUITE_LOG_FILE}"
  then
- TOTAL=$(sed -n "s/.*# TOTAL: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
- PASS=$(sed -n "s/.*# PASS: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
- SKIP=$(sed -n "s/.*# SKIP: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
- FAIL=$(sed -n "s/.*# FAIL: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
- XPASS=$(sed -n "s/.*# XPASS: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
- ERROR=$(sed -n "s/.*# ERROR: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+ source ${path_UUTILS}/util/analyze-gnu-results.sh ${SUITE_LOG_FILE} ${ROOT_SUITE_LOG_FILE}
  if [[ "$TOTAL" -eq 0 || "$TOTAL" -eq 1 ]]; then
  echo "::error ::Failed to parse test results from '${SUITE_LOG_FILE}'; failing early"
  exit 1
@@ -257,8 +268,8 @@ jobs:
  ## Some tests fail with 'cannot change locale (en_US.ISO-8859-1): No such file or directory'
  ## Some others need a French locale
  sudo locale-gen
- sudo locale-gen fr_FR
- sudo locale-gen fr_FR.UTF-8
+ sudo locale-gen --keep-existing fr_FR
+ sudo locale-gen --keep-existing fr_FR.UTF-8
  sudo update-locale
  echo "After:"
  locale -a

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/DEVELOPER_INSTRUCTIONS.md b/DEVELOPER_INSTRUCTIONS.md
@@ -21,7 +21,7 @@ Running GNU tests
 At the end you should have uutils, gnu and gnulib checked out next to each other.
 
 - Run `cd uutils && ./util/build-gnu.sh && cd ..` to get everything ready (this may take a while)
-- Finally, you can run tests with `bash uutils/util/run-gnu-test.sh <test>`. Instead of `<test>` insert the test you want to run, e.g. `tests/misc/wc-proc.sh`.
+- Finally, you can run tests with `bash uutils/util/run-gnu-test.sh <tests>`. Instead of `<tests>` insert the tests you want to run, e.g. `tests/misc/wc-proc.sh`.
 
 
 Code Coverage Report Generation

diff --git a/README.md b/README.md
@@ -369,6 +369,8 @@ $ bash util/build-gnu.sh
 $ bash util/run-gnu-test.sh
 # To run a single test:
 $ bash util/run-gnu-test.sh tests/touch/not-owner.sh # for example
+# To run several tests:
+$ bash util/run-gnu-test.sh tests/touch/not-owner.sh tests/rm/no-give-up.sh # for example
 # If this is a perl (.pl) test, to run in debug:
 $ DEBUG=1 bash util/run-gnu-test.sh tests/misc/sm3sum.pl
 ```

diff --git a/src/uu/hashsum/Cargo.toml b/src/uu/hashsum/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2021"
 path = "src/hashsum.rs"
 
 [dependencies]
-digest = "0.10.1"
+digest = "0.10.5"
 clap = { version = "3.2", features = ["wrap_help", "cargo"] }
 hex = "0.4.3"
 memchr = "2"

diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml
@@ -20,7 +20,7 @@ clap = { version = "3.2", features = ["wrap_help", "cargo", "env"] }
 unicode-width = "0.1.8"
 number_prefix = "0.4"
 term_grid = "0.1.5"
-terminal_size = "0.1"
+terminal_size = "0.2.1"
 glob = "0.3.0"
 lscolors = { version = "0.12.0", features = ["ansi_term"] }
 uucore = { version=">=0.0.15", package="uucore", path="../../uucore", features = ["entries", "fs"] }