components/coreutils/patches/tests-misc-expr.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 2399 20c46127e17a
child 1833 0edb05d72e6b
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2399
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
---  coreutils-8.16/tests/misc/expr.orig	2012-09-03 07:18:28.214998564 -0700
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
+++  coreutils-8.16/tests/misc/expr	2012-09-03 07:22:12.547808280 -0700
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
@@ -140,7 +140,11 @@
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
      ['bre48', '_ : "a\\{1,x"',
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
       {ERR => "$prog: Unmatched \\{\n"}, {EXIT => 2}],
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
      ['bre49', '_ : "a\\{32768\\}"',
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
-      {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}],
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
+      {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2},
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
+      # Map AIX-6's different diagnostic to the one we expect:
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
+      {ERR_SUBST =>
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
+       's,Regular expression too big,Invalid content of \\\\{\\\\},'},
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
+      ],
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
      ['bre50', '_ : "a\\{1,0\\}"',
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
       {ERR => "$prog: Invalid content of \\{\\}\n"}, {EXIT => 2}],
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
      ['bre51', '"acabc" : ".*ab\\{0,0\\}c"', {OUT => '2'}],
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
@@ -171,7 +175,7 @@
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
     );
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
 # If using big numbers fails, remove all /^bignum-/ tests
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20
-`expr $big_prod '*' $big_prod '*' $big_prod`
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    21
+qx!expr $big_prod '*' $big_prod '*' $big_prod!
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    22
   or @Tests = grep {$_->[0] !~ /^bignum-/} @Tests;
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    23
 
20c46127e17a PSARC 2012/170 GNU coreutils 8.16
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    24
 # Append a newline to end of each expected 'OUT' string.