[Pkg-shadow-commits] r3235 - in debian/trunk/tests: chsh/01 convtools/01 cptools/01

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-08-26 19:16:40 +0000 (Thu, 26 Aug 2010)
New Revision: 3235

Modified:
   debian/trunk/tests/chsh/01/run
   debian/trunk/tests/convtools/01/run
   debian/trunk/tests/cptools/01/run1
   debian/trunk/tests/cptools/01/run2
   debian/trunk/tests/cptools/01/run3
   debian/trunk/tests/cptools/01/run4
Log:
Added support for dash.


Modified: debian/trunk/tests/chsh/01/run
===================================================================
--- debian/trunk/tests/chsh/01/run	2010-08-26 19:13:30 UTC (rev 3234)
+++ debian/trunk/tests/chsh/01/run	2010-08-26 19:16:40 UTC (rev 3235)
@@ -40,7 +40,10 @@
 # restore the files on exit
 trap 'if [ "$?" != "0" ]; then echo "FAIL"; fi; restore' 0
 
-cp data/{passwd,group,shadow,gshadow,shells} /etc/
+for i in passwd group shadow gshadow shells
+do
+	cp data/$i /etc
+done
 
 echo -n "changing to a restricted shell, by root..."
 cp /bin/bash tmp/shell

Modified: debian/trunk/tests/convtools/01/run
===================================================================
--- debian/trunk/tests/convtools/01/run	2010-08-26 19:13:30 UTC (rev 3234)
+++ debian/trunk/tests/convtools/01/run	2010-08-26 19:16:40 UTC (rev 3235)
@@ -48,8 +48,14 @@
 # restore the files on exit
 trap 'restore' 0
 
-rm -f /etc/{passwd,shadow,group,gshadow}
-cp data/1/{passwd,group} /etc/
+for i in passwd group shadow gshadow
+do
+	rm -f /etc/$i
+done
+for i in passwd group
+do
+	cp data/1/$i /etc
+done
 
 echo -n "pwconv "
 pwconv

Modified: debian/trunk/tests/cptools/01/run1
===================================================================
--- debian/trunk/tests/cptools/01/run1	2010-08-26 19:13:30 UTC (rev 3234)
+++ debian/trunk/tests/cptools/01/run1	2010-08-26 19:16:40 UTC (rev 3235)
@@ -32,7 +32,10 @@
 # restore the files on exit
 trap 'restore' 0
 
-cp data/{passwd,shadow,group,gshadow} /etc/
+for i in passwd group shadow gshadow
+do
+	cp data/$i /etc
+done
 
 lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
 lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")

Modified: debian/trunk/tests/cptools/01/run2
===================================================================
--- debian/trunk/tests/cptools/01/run2	2010-08-26 19:13:30 UTC (rev 3234)
+++ debian/trunk/tests/cptools/01/run2	2010-08-26 19:16:40 UTC (rev 3235)
@@ -32,7 +32,10 @@
 # restore the files on exit
 trap 'restore' 0
 
-cp data/{passwd,shadow,group,gshadow} /etc/
+for i in passwd group shadow gshadow
+do
+	cp data/$i /etc
+done
 
 lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
 lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")

Modified: debian/trunk/tests/cptools/01/run3
===================================================================
--- debian/trunk/tests/cptools/01/run3	2010-08-26 19:13:30 UTC (rev 3234)
+++ debian/trunk/tests/cptools/01/run3	2010-08-26 19:16:40 UTC (rev 3235)
@@ -32,7 +32,10 @@
 # restore the files on exit
 trap 'restore' 0
 
-cp data/{passwd,shadow,group,gshadow} /etc/
+for i in passwd group shadow gshadow
+do
+	cp data/$i /etc
+done
 
 lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
 lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")

Modified: debian/trunk/tests/cptools/01/run4
===================================================================
--- debian/trunk/tests/cptools/01/run4	2010-08-26 19:13:30 UTC (rev 3234)
+++ debian/trunk/tests/cptools/01/run4	2010-08-26 19:16:40 UTC (rev 3235)
@@ -32,7 +32,10 @@
 # restore the files on exit
 trap 'restore' 0
 
-cp data/{passwd,shadow,group,gshadow} /etc/
+for i in passwd group shadow gshadow
+do
+	cp data/$i /etc
+done
 
 lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
 lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")