From 0cd9241a2df778aac98c0c848c1348abad160306 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Thu, 16 Jan 2020 11:26:35 -0500 Subject: [PATCH] test/json_config: Freebsd supports python3 now so use it Change-Id: I7a03dddfbc455f9d9374ce864dc3c9fab157d81e Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/481889 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Community-CI: SPDK CI Jenkins --- test/json_config/json_diff.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/test/json_config/json_diff.sh b/test/json_config/json_diff.sh index ce36d5a87..e6b9e223d 100755 --- a/test/json_config/json_diff.sh +++ b/test/json_config/json_diff.sh @@ -8,12 +8,6 @@ if [ $# -ne 2 ]; then fi rootdir=$(readlink -f $(dirname $0)/../..) -# FIXME: Remove this when python3 will be on FeeBSD machines -if [ $(uname -s) = "FreeBSD" ]; then - python_cmd=python -else - python_cmd="" -fi # Compare two JSON files. # @@ -25,8 +19,8 @@ tmp_file_1=$(mktemp /tmp/$(basename ${1}).XXX) tmp_file_2=$(mktemp /tmp/$(basename ${2}).XXX) ret=0 -$python_cmd $rootdir/test/json_config/config_filter.py -method "sort" < $1 > $tmp_file_1 -$python_cmd $rootdir/test/json_config/config_filter.py -method "sort" < $2 > $tmp_file_2 +$rootdir/test/json_config/config_filter.py -method "sort" < $1 > $tmp_file_1 +$rootdir/test/json_config/config_filter.py -method "sort" < $2 > $tmp_file_2 if ! diff -u $tmp_file_1 $tmp_file_2; then ret=1