Ignore:
Timestamp:
Jul 29, 2010, 4:51:05 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
3f77b42
Parents:
5359083
Message:

Updated Expect to 5.44.1.15.

Location:
BOOK/testsuite-tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • BOOK/testsuite-tools/common/expect.xml

    r5359083 r1341743  
    2626    <title>Installation of Expect</title>
    2727
    28     <para os="s1">The following sed tells <command>configure</command> to look
    29     for libraries in ${libdir}, not just in /tools/lib:</para>
     28    <para os="p1">The following patch prevents Expect from detecting Tk and
     29    trying to build expectk:</para>
    3030
    31 <screen os="s2"><userinput>sed -i '/EXP_LIB_SPEC=/s@${exec_prefix}/lib@${libdir}@' configure</userinput></screen>
    32 
    33     <para os="t1">The following sed adds a missing include to
    34     <filename>Dbg.c</filename>:</para>
    35 
    36 <screen os="t2"><userinput>sed -i '1i\#include &lt;expect_cf.h&gt;' Dbg.c</userinput></screen>
    37 
    38     <para os="t3">The following sed causes one of the source files to include
    39     the correct header</para>
    40 
    41 <screen os="t4"><userinput>sed -i "s/tcl.h/tclInt.h/" exp_inter.c</userinput></screen>
    42 
    43     <para os="p1">The following patch prevents Expect from using functions
    44     that are internal to TCL and are no longer available for Expect to
    45     link against:</para>
    46 
    47 <screen os="p2"><userinput>patch -Np1 -i ../&expect-avoid_tcl_internals-patch;</userinput></screen>
    48 
    49     <para os="a">Fix a bug that can result in false failures during the GCC
    50     test suite run:</para>
    51 
    52 <screen os="b"><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
     31<screen os="p2"><userinput>patch -Np1 -i ../&expect-notk-patch;</userinput></screen>
    5332
    5433    <para os="c">Now prepare Expect for compilation:</para>

  • BOOK/testsuite-tools/mips/expect.xml

    r5359083 r1341743  
    2828   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/expect.xml"
    30     xpointer="xpointer(//*[@os='s1'])"/>
    31 
    32     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/expect.xml"
    34     xpointer="xpointer(//*[@os='s2'])"/>
    35 
    36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/expect.xml"
    38     xpointer="xpointer(//*[@os='t1'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/expect.xml"
    42     xpointer="xpointer(//*[@os='t2'])"/>
    43 
    44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/expect.xml"
    46     xpointer="xpointer(//*[@os='t3'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/expect.xml"
    50     xpointer="xpointer(//*[@os='t4'])"/>
    51 
    52    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    53     href="../common/expect.xml"
    5430    xpointer="xpointer(//*[@os='p1'])"/>
    5531
    … …  
    5834    xpointer="xpointer(//*[@os='p2'])"/>
    5935
    60    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="../common/expect.xml"
    62     xpointer="xpointer(//*[@os='a'])"/>
    63 
    64     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    65     href="../common/expect.xml"
    66     xpointer="xpointer(//*[@os='b'])"/>
    67 
    68     <para os="p1">This patch updates <filename>config.guess</filename> and
     36    <para os="mp1">This patch updates <filename>config.guess</filename> and
    6937    <filename>config.sub</filename> for MIPS processors:</para>
    7038
    71 <screen os="p2"><userinput>patch -Np1 -i ../&expect-config_update-patch;</userinput></screen>
     39<screen os="mp2"><userinput>patch -Np1 -i ../&expect-config_update-patch;</userinput></screen>
    7240
    7341    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/testsuite-tools/mips64/expect.xml

    r5359083 r1341743  
    2424   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/expect.xml"
    26     xpointer="xpointer(//*[@os='s1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    29     href="../common/expect.xml"
    30     xpointer="xpointer(//*[@os='s2'])"/>
    31 
    32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/expect.xml"
    34     xpointer="xpointer(//*[@os='t1'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/expect.xml"
    38     xpointer="xpointer(//*[@os='t2'])"/>
    39 
    40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/expect.xml"
    42     xpointer="xpointer(//*[@os='t3'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/expect.xml"
    46     xpointer="xpointer(//*[@os='t4'])"/>
    47 
    48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/expect.xml"
    5026    xpointer="xpointer(//*[@os='p1'])"/>
    5127
    … …  
    5531
    5632    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    57     href="../common/expect.xml"
    58     xpointer="xpointer(//*[@os='a'])"/>
    59 
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="../common/expect.xml"
    62     xpointer="xpointer(//*[@os='b'])"/>
     33    href="../mips/expect.xml"
     34    xpointer="xpointer(//*[@os='mp1'])"/>
    6335
    6436    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6537    href="../mips/expect.xml"
    66     xpointer="xpointer(//*[@os='p1'])"/>
    67 
    68     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    69     href="../mips/expect.xml"
    70     xpointer="xpointer(//*[@os='p2'])"/>
     38    xpointer="xpointer(//*[@os='mp2'])"/>
    7139
    7240    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/testsuite-tools/multilib/expect.xml

    r5359083 r1341743  
    2424   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2525    href="../common/expect.xml"
    26     xpointer="xpointer(//*[@os='s1'])"/>
    27 
    28     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    29     href="../common/expect.xml"
    30     xpointer="xpointer(//*[@os='s2'])"/>
    31 
    32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    33     href="../common/expect.xml"
    34     xpointer="xpointer(//*[@os='t1'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    37     href="../common/expect.xml"
    38     xpointer="xpointer(//*[@os='t2'])"/>
    39 
    40    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    41     href="../common/expect.xml"
    42     xpointer="xpointer(//*[@os='t3'])"/>
    43 
    44     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/expect.xml"
    46     xpointer="xpointer(//*[@os='t4'])"/>
    47 
    48    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    49     href="../common/expect.xml"
    5026    xpointer="xpointer(//*[@os='p1'])"/>
    5127
    … …  
    5329    href="../common/expect.xml"
    5430    xpointer="xpointer(//*[@os='p2'])"/>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    57     href="../common/expect.xml"
    58     xpointer="xpointer(//*[@os='a'])"/>
    59 
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="../common/expect.xml"
    62     xpointer="xpointer(//*[@os='b'])"/>
    6331
    6432    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Note: See TracChangeset for help on using the changeset viewer.