george/blackbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add better support for NetBSD and SunOS in test scripts.

Browse Source
This commit is contained in:
Travis Paul
2018-11-30 10:59:21 +08:00
parent 3a491aad01
commit fd3ad2fcea
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/confidence_test.sh
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
blackbox_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../bin blackbox_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../bin
export PATH="${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:${blackbox_home}" export PATH="${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:${blackbox_home}"
export LANG=C.UTF-8 # Required ro "gpg --export" to work properly. export LANG=C.UTF-8 # Required ro "gpg --export" to work properly.

14
tools/test_functions.sh
View File

@@ -24,6 +24,12 @@ function md5sum_file() {
Darwin | FreeBSD ) Darwin | FreeBSD )
md5 -r "$1" | awk '{ print $1 }' md5 -r "$1" | awk '{ print $1 }'
;; ;;
NetBSD )
md5 -q "$1"
;;
SunOS )
digest -a md5 "$1"
;;
Linux ) Linux )
md5sum "$1" | awk '{ print $1 }' md5sum "$1" | awk '{ print $1 }'
;; ;;
@@ -72,10 +78,10 @@ function assert_file_group() {
assert_file_exists "$file" assert_file_exists "$file"
case $(uname -s) in case $(uname -s) in
Darwin|FreeBSD ) Darwin | FreeBSD | NetBSD )
found=$(stat -f '%Dg' "$file") found=$(stat -f '%Dg' "$file")
;; ;;
Linux ) Linux | SunOS )
found=$(stat -c '%g' "$file") found=$(stat -c '%g' "$file")
;; ;;
CYGWIN* ) CYGWIN* )
@@ -102,11 +108,11 @@ function assert_file_perm() {
assert_file_exists "$file" assert_file_exists "$file"
case $(uname -s) in case $(uname -s) in
Darwin|FreeBSD ) Darwin | FreeBSD | NetBSD )
found=$(stat -f '%Sp' "$file") found=$(stat -f '%Sp' "$file")
;; ;;
# NB(tlim): CYGWIN hasn't been tested. It might be more like Darwin. # NB(tlim): CYGWIN hasn't been tested. It might be more like Darwin.
Linux | CYGWIN* ) Linux | CYGWIN* | SunOS )
found=$(stat -c '%A' "$file") found=$(stat -c '%A' "$file")
;; ;;
* ) * )