From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 27 Sep 2020 09:30:17 +0000 (+0200)
Subject: test-sysusers: sort examples
X-Git-Tag: v247-rc1~134^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69a7c5fb1fc5aba77269701ceb417e441ae15f6b;p=thirdparty%2Fsystemd.git

test-sysusers: sort examples

This shouldn't affect the outcome, but makes outputs easier to compare.
---

diff --git a/test/test-sysusers.sh.in b/test/test-sysusers.sh.in
index ac07c2145b1..b84d6f2d80b 100755
--- a/test/test-sysusers.sh.in
+++ b/test/test-sysusers.sh.in
@@ -41,7 +41,7 @@ compare() {
 rm -f $TESTDIR/etc/sysusers.d/* $TESTDIR/usr/lib/sysusers.d/*
 
 # happy tests
-for f in $SOURCE/test-*.input; do
+for f in $(ls -1 $SOURCE/test-*.input | sort -V); do
     echo "*** Running $f"
     prepare_testdir ${f%.input}
     cp $f $TESTDIR/usr/lib/sysusers.d/test.conf
@@ -50,7 +50,7 @@ for f in $SOURCE/test-*.input; do
     compare $f ""
 done
 
-for f in $SOURCE/test-*.input; do
+for f in $(ls -1 $SOURCE/test-*.input | sort -V); do
     echo "*** Running $f on stdin"
     prepare_testdir ${f%.input}
     touch $TESTDIR/etc/sysusers.d/test.conf
@@ -59,7 +59,7 @@ for f in $SOURCE/test-*.input; do
     compare $f "on stdin"
 done
 
-for f in $SOURCE/test-*.input; do
+for f in $(ls -1 $SOURCE/test-*.input | sort -V); do
     echo "*** Running $f on stdin with --replace"
     prepare_testdir ${f%.input}
     touch $TESTDIR/etc/sysusers.d/test.conf
@@ -98,7 +98,7 @@ compare $SOURCE/inline "(--inline --replace=…)"
 rm -f $TESTDIR/etc/sysusers.d/* $TESTDIR/usr/lib/sysusers.d/*
 
 # tests for error conditions
-for f in $SOURCE/unhappy-*.input; do
+for f in $(ls -1 $SOURCE/unhappy-*.input | sort -V); do
     echo "*** Running test $f"
     prepare_testdir ${f%.input}
     cp $f $TESTDIR/usr/lib/sysusers.d/test.conf