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

test: various fixes (mostly bash 5 related) #3554

Merged
merged 6 commits into from
Feb 7, 2019
Merged

test: various fixes (mostly bash 5 related) #3554

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81c5d18
test: detect missing dependency in "magic" test
marcinslusarz Feb 5, 2019
018ae29
test: fix pmempool_info/TEST26 with bash5
marcinslusarz Feb 5, 2019
0ffdb30
test: fix escaping in expect_[ab]normal_exit under bash5
marcinslusarz Feb 5, 2019
a0f19e2
test: obey UNITTEST_LOG_LEVEL in require_fs_name
marcinslusarz Feb 6, 2019
8721950
test: don't rely on order of keys in an assoc. array
marcinslusarz Feb 6, 2019
a330048
test: rpmemd_config/TEST5: fix compatibility with bash 5
marcinslusarz Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test: rpmemd_config/TEST5: fix compatibility with bash 5 
Ref: pmem/issues#1008
  • Loading branch information
@marcinslusarz
marcinslusarz committed Feb 6, 2019
commit a330048a3309e50be83d3ff9d2eb0aa987ebc2bb
12 changes: 5 additions & 7 deletions src/test/rpmemd_config/TEST4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2016-2018, Intel Corporation
# Copyright 2016-2019, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -54,21 +54,19 @@ EMPTY_CONFIG=$DIR/empty.conf
touch $EMPTY_CONFIG

function check_user_home_dir {
HOME_STR=\\\$HOME

expect_normal_exit $RPMEMD -c $EMPTY_CONFIG print_HOME_env
cat $LOG >> $LOG_TEMP

expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=$HOME_STR print_HOME_env
expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir='\$HOME' print_HOME_env
cat $LOG >> $LOG_TEMP

expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=prefix$HOME_STR print_HOME_env
expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=prefix'\$HOME' print_HOME_env
cat $LOG >> $LOG_TEMP

expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=${HOME_STR}stickysuffix print_HOME_env
expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir='\$HOME'stickysuffix print_HOME_env
cat $LOG >> $LOG_TEMP

expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir=${HOME_STR}/suffix print_HOME_env
expect_normal_exit $RPMEMD -c $EMPTY_CONFIG --poolset-dir='\$HOME'/suffix print_HOME_env
cat $LOG >> $LOG_TEMP
}

Expand Down