Changeset 7a8cc24 for BOOK/testsuite-tools

Timestamp:

Feb 21, 2006, 1:56:03 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f0ed7ed

Parents:

98a37f1

Message:

r972@server (orig r970): ken | 2005-12-28 17:06:15 -0800
Either we booted or we chrooted, so tk and X on the host are not visible by the time we get to expect.

Location:

BOOK/testsuite-tools

Files:

• common/expect.xml (modified) (2 diffs)
• mips64/expect-64bit.xml (modified) (2 diffs)
• multilib/expect-64bit.xml (modified) (2 diffs)

BOOK/testsuite-tools/common/expect.xml

@@ -43 +43 @@
 
 <screen os="d"><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-   --with-tclinclude=/tools/include --with-x=no</userinput></screen>
+   --with-tclinclude=/tools/include</userinput></screen>
 
     <variablelist os="e">
@@ -63 +63 @@
           where <command>configure</command> fails because it cannot
           automatically discover the location of the Tcl source directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e3">
-        <term><parameter>--with-x=no</parameter></term>
-        <listitem>
-          <para>This tells the configure script not to search for Tk
-          (the Tcl GUI component) or the X Window System libraries, both of
-          which may reside on the host system but will not exist when
-          building the final system.</para>
         </listitem>
       </varlistentry>

BOOK/testsuite-tools/mips64/expect-64bit.xml

@@ -44 +44 @@
 <screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
    --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
-   --libdir=/tools/lib64 --with-x=no</userinput></screen>
+   --libdir=/tools/lib64</userinput></screen>
 
     <variablelist os="e">
@@ -60 +60 @@
         href="../common/expect.xml"
         xpointer="xpointer(//*[@os='e2'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-        href="../common/expect.xml"
-        xpointer="xpointer(//*[@os='e3'])"/>
 
     </variablelist>

BOOK/testsuite-tools/multilib/expect-64bit.xml

@@ -36 +36 @@
 <screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
    --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
-   --libdir=/tools/lib64 --with-x=no</userinput></screen>
+   --libdir=/tools/lib64</userinput></screen>
 
     <variablelist os="e">
@@ -52 +52 @@
         href="../common/expect.xml"
         xpointer="xpointer(//*[@os='e2'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-        href="../common/expect.xml"
-        xpointer="xpointer(//*[@os='e3'])"/>
 
     </variablelist>