Ilya Zakharevich on Sat, 27 May 2006 02:17:27 +0200


[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]

[PATCH] test install()


The branch of test which checks for failure of install() does not work
on OS/2.  I saw also reports that it does not work on AIX too.

I needed the following change to make it work on OS/2.  I have no idea
where this number 49 comes from...  (I also took an opportunity to fix
identation; the diff -pubw is

     pat=`${head}4 $file_diff|${tail}1|grep "112,122"`
     sys0190=`grep "^+ SYS0190\>" $file_diff`

    -if test $len -eq 51  -a  -n "$sys0190"; then
    -  len=49                       # more verbose error message on OS/2
    +  if test -n "$sys0190"; then
    +    len=`expr $len - 2`                        # more verbose error message on OS/2
    +  fi
    +  if test $len -eq 29; then
    +    len=49                             # ??? Usually len=29???
     fi
     if test $len -eq 49  -a  -n "$pat"; then
     cat << EOT

)

Enjoy,
Ilya

--- ./src/test/dotest-ini	Fri May 26 16:54:56 2006
+++ ./src/test/dotest	Fri May 26 17:03:30 2006
@@ -135,19 +135,22 @@ case "x$bugp" in
       file_diff=program-sta.dif;;
 esac
 if test -n "$file_diff"; then
-len=`wc -l $file_diff | sed -e 's/ *\([0-9]*\).*/\1/'`
-pat=`${head}4 $file_diff|${tail}1|grep "112,122"`
-sys0190=`grep "^+ SYS0190\>" $file_diff`
+  len=`wc -l $file_diff | sed -e 's/ *\([0-9]*\).*/\1/'`
+  pat=`${head}4 $file_diff|${tail}1|grep "112,122"`
+  sys0190=`grep "^+ SYS0190\>" $file_diff`
 
-if test $len -eq 51  -a  -n "$sys0190"; then
-  len=49			# more verbose error message on OS/2
-fi
-if test $len -eq 49  -a  -n "$pat"; then
-cat << EOT
+  if test -n "$sys0190"; then
+    len=`expr $len - 2`			# more verbose error message on OS/2
+  fi
+  if test $len -eq 29; then
+    len=49				# ??? Usually len=29???
+  fi
+  if test $len -eq 49  -a  -n "$pat"; then
+    cat << EOT
 NOTE: the problem noted in 'program' is that install() does not work in your
 configuration$end, so you will not be able to use this feature. Otherwise you
 can safely ignore the above warning.
 EOT
-fi
+  fi
 fi
 exit 1