Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mimic: test: Start using GNU awk and fix archiving directory #25242

Merged
merged 1 commit into from Jan 3, 2019
Merged

mimic: test: Start using GNU awk and fix archiving directory #25242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions install-deps.sh
View file
Open in desktop
Expand Up @@ -135,6 +135,7 @@ if [ x`uname`x = xFreeBSDx ]; then
net/socat \
textproc/expat2 \
textproc/gsed \
lang/gawk \
textproc/libxml2 \
textproc/xmlstarlet \
textproc/jq \
Expand Down
14 changes: 9 additions & 5 deletions qa/standalone/ceph-helpers.sh
View file
Open in desktop
Expand Up @@ -19,7 +19,9 @@
#
TIMEOUT=300
PG_NUM=4
CEPH_BUILD_VIRTUALENV=${TMPDIR:-/tmp}
TMPDIR=${TMPDIR:-/tmp}
CEPH_BUILD_VIRTUALENV=${TMPDIR}
TESTDIR=${TESTDIR:-${TMPDIR}}

if type xmlstarlet > /dev/null 2>&1; then
XMLSTARLET=xmlstarlet
Expand All @@ -32,10 +34,12 @@ fi

if [ `uname` = FreeBSD ]; then
SED=gsed
AWK=gawk
DIFFCOLOPTS=""
KERNCORE="kern.corefile"
else
SED=sed
AWK=awk
termwidth=$(stty -a | head -1 | sed -e 's/.*columns \([0-9]*\).*/\1/')
if [ -n "$termwidth" -a "$termwidth" != "0" ]; then
termwidth="-W ${termwidth}"
Expand Down Expand Up @@ -197,8 +201,8 @@ function teardown() {

function __teardown_btrfs() {
local btrfs_base_dir=$1
local btrfs_root=$(df -P . | tail -1 | awk '{print $NF}')
local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list -t . | awk '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir")
local btrfs_root=$(df -P . | tail -1 | $AWK '{print $NF}')
local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list -t . | $AWK '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir")
for subvolume in $btrfs_dirs; do
sudo btrfs subvolume delete $btrfs_root/$subvolume
done
Expand Down Expand Up @@ -1350,7 +1354,7 @@ function test_is_clean() {

#######################################################################

calc() { awk "BEGIN{print $*}"; }
calc() { $AWK "BEGIN{print $*}"; }

##
# Return a list of numbers that are increasingly larger and whose
Expand Down Expand Up @@ -1757,7 +1761,7 @@ function run_in_background() {
local pid_variable=$1
shift
# Execute the command and prepend the output with its pid
# We enforce to return the exit status of the command and not the awk one.
# We enforce to return the exit status of the command and not the sed one.
("$@" |& sed 's/^/'$$': /'; return "${PIPESTATUS[0]}") >&2 &
eval "$pid_variable+=\" $!\""
}
Expand Down