Bug 1395495, bustage fix, Don't use the modu function from cert.sh, r=kaie
authorDaiki Ueno <dueno@redhat.com>
Mon, 18 Sep 2017 15:51:19 +0200
changeset 13594 70109a01ce53328b511aaa6c839593a3282cb725
parent 13593 279b257c6433f1972d49c529247e6ed2633b979f
child 13595 18edd4ad8389d50d4231cc1a545a468dbb11185c
push id2379
push userkaie@kuix.de
push dateMon, 18 Sep 2017 14:21:29 +0000
reviewerskaie
bugs1395495
Bug 1395495, bustage fix, Don't use the modu function from cert.sh, r=kaie
tests/tools/tools.sh
--- a/tests/tools/tools.sh
+++ b/tests/tools/tools.sh
@@ -496,17 +496,19 @@ SIGNSCRIPT
   html_msg $? 0 "Show who signed xpi (signtool -w)"
 
 }
 
 tools_modutil()
 {
   echo "$SCRIPTNAME: Test if DB created by modutil -create is initialized"
   mkdir -p ${R_TOOLSDIR}/moddir
-  modu -create -dbdir "${R_TOOLSDIR}/moddir" 2>&1
+  # copied from modu function in cert.sh
+  # echo is used to press Enter expected by modutil
+  echo | ${BINDIR}/modutil -create -dbdir "${R_TOOLSDIR}/moddir" 2>&1
   ret=$?
   ${BINDIR}/certutil -S -s 'CN=TestUser' -d "${TOOLSDIR}/moddir" -n TestUser \
 	   -x -t ',,' -z "${R_NOISE_FILE}"
   ret=$?
   html_msg $ret 0 "Test if DB created by modutil -create is initialized"
   check_tmpfile
 }