diff options
author | Yann Collet <Cyan4973@users.noreply.github.com> | 2021-08-08 09:50:55 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-08 09:50:55 (GMT) |
commit | eb70459803b8ea1d879c011ed5c8f5d5c16d250b (patch) | |
tree | 85c7bf0235ef3c771fe384e3030da66d0d896f9f | |
parent | de45d6e0fa59e1c5dc21f611dd73f91ba04aaff1 (diff) | |
parent | e2561f20e6919a94d0be697db16fb6a3f4602b38 (diff) | |
download | lz4-eb70459803b8ea1d879c011ed5c8f5d5c16d250b.zip lz4-eb70459803b8ea1d879c011ed5c8f5d5c16d250b.tar.gz lz4-eb70459803b8ea1d879c011ed5c8f5d5c16d250b.tar.bz2 |
Merge pull request #1019 from servusdei2018/patch-1
nit(programs/platform.h): replace Unicode character #1018
-rw-r--r-- | .travis.yml | 6 | ||||
-rw-r--r-- | programs/platform.h | 2 | ||||
-rw-r--r-- | tests/unicode_lint.sh | 35 |
3 files changed, 42 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 0616021..8eae1a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -231,6 +231,12 @@ matrix: - name: Compile OSS-Fuzz targets script: - ./ossfuzz/travisoss.sh + + # Unicode lint + # See https://github.com/lz4/lz4/issues/1018 + - name: Run Unicode lint + script: + - ./tests/unicode_lint.sh allow_failures: - env: ALLOW_FAILURES=true diff --git a/programs/platform.h b/programs/platform.h index abcd67b..43a171b 100644 --- a/programs/platform.h +++ b/programs/platform.h @@ -80,7 +80,7 @@ extern "C" { ************************************************************** */ #if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) /* UNIX-like OS */ \ || defined(__midipix__) || defined(__VMS)) -# if (defined(__APPLE__) && defined(__MACH__)) || defined(__SVR4) || defined(_AIX) || defined(__hpux) /* POSIX.1–2001 (SUSv3) conformant */ \ +# if (defined(__APPLE__) && defined(__MACH__)) || defined(__SVR4) || defined(_AIX) || defined(__hpux) /* POSIX.1-2001 (SUSv3) conformant */ \ || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MidnightBSD__) /* BSD distros */ \ || defined(__HAIKU__) # define PLATFORM_POSIX_VERSION 200112L diff --git a/tests/unicode_lint.sh b/tests/unicode_lint.sh new file mode 100644 index 0000000..969fcc5 --- /dev/null +++ b/tests/unicode_lint.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# `unicode_lint.sh' determines whether source files under the ./lib/ and ./programs/ directories +# contain Unicode characters, and fails if any do. +# +# See https://github.com/lz4/lz4/issues/1018 + +pass=true + +# Scan ./lib/ for Unicode in source (*.c, *.h) files +result=$( + find ./lib/ -regex '.*\.\(c\|h\)$' -exec grep -P -n "[^\x00-\x7F]" {} \; -exec echo "{}: FAIL" \; +) +if [[ $result ]]; then + echo "$result" + pass=false +fi + +# Scan ./programs/ for Unicode in source (*.c, *.h) files +result=$( + find ./programs/ -regex '.*\.\(c\|h\)$' -exec grep -P -n "[^\x00-\x7F]" {} \; -exec echo "{}: FAIL" \; +) +if [[ $result ]]; then + echo "$result" + pass=false +fi + +if [ "$pass" = true ]; then + echo "All tests successful." + echo "Result: PASS" + exit 0 +else + echo "Result: FAIL" + exit 1 +fi |