From 4ed2ddc70659ca49342c9c7c68ae2b5cef2c0214 Mon Sep 17 00:00:00 2001 From: Adam Borowski <adam.borowski@intel.com> Date: Mon, 4 Feb 2019 16:14:50 +0100 Subject: [PATCH] test: quote whitespace in rpmemd_config/TEST2 Bash 5 changed its rules somehow; let's protect the spaces to be safe. --- src/test/rpmemd_config/TEST2 | 4 ++-- src/test/rpmemd_config/stdout2.log.match | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/rpmemd_config/TEST2 b/src/test/rpmemd_config/TEST2 index 09da731f1..45328c830 100755 --- a/src/test/rpmemd_config/TEST2 +++ b/src/test/rpmemd_config/TEST2 @@ -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 @@ -55,7 +55,7 @@ INVALID_FLAG=invalid INVALID_ENUM=Invalid function check_config { - echo -e $1 > $CONFIG + echo -e "$1" > $CONFIG expect_normal_exit $RPMEMD -c $CONFIG 1>> $OUT_TEMP 2>&1 expect_normal_exit $RPMEMD --config $CONFIG 1>> $OUT_TEMP 2>&1 } diff --git a/src/test/rpmemd_config/stdout2.log.match b/src/test/rpmemd_config/stdout2.log.match index eb0f31fd6..7e679ecdf 100644 --- a/src/test/rpmemd_config/stdout2.log.match +++ b/src/test/rpmemd_config/stdout2.log.match @@ -3,13 +3,13 @@ Invalid config file line at $(*):1 Invalid config file line at $(*):1 ; invalid comment format Invalid config file line at $(*):1 -dir= # invalid dir path +dir= # invalid dir path Invalid config file line at $(*):1 -dir= # invalid dir path +dir= # invalid dir path Invalid config file line at $(*):1 -log-file= # invalid log-file path +log-file= # invalid log-file path Invalid config file line at $(*):1 -log-file= # invalid log-file path +log-file= # invalid log-file path Invalid config file line at $(*):1 log-level=Invalid # invalid log-level Invalid config file line at $(*):1 -- GitLab