Changeset 45bf79c

Timestamp:

Oct 11, 2006, 9:48:23 PM (18 years ago)

Author:

Chris Staub <chris@…>

Branches:

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

Children:

be500de

Parents:

5eecd33

Message:

Move text about tcl expect and dejagnu from tcl page to the beginning of the chapter

Location:

BOOK/testsuite-tools

Files:

• common/introduction.xml (modified) (1 diff)
• common/tcl.xml (modified) (1 diff)
• multilib/tcl-64bit.xml (modified) (3 diffs)

BOOK/testsuite-tools/common/introduction.xml

@@ -12 +12 @@
 
   <para>This chapter builds the tools needed to run the tests
-  that the packages have. I.e., <command>make check</command></para>
+  that the packages have. I.e., <command>make check</command>. Tcl, Expect,
+  DejaGNU and File are needed for the GCC and Binutils testsuites, and Tree
+  is used by the Udev testsuite. Installing five packages for testing purposes
+  may seem excessive, but it is very reassuring, if not essential, to know
+  that the most important tools are working properly.</para>
 
 </sect1>

BOOK/testsuite-tools/common/tcl.xml

@@ -25 +25 @@
     <title>Installation of Tcl</title>
 
-    <para os="a">This package and the next two (Expect and DejaGNU) are installed
-    to support running the test suites for GCC and Binutils. Installing
-    three packages for testing purposes may seem excessive, but it is very
-    reassuring, if not essential, to know that the most important tools are
-    working properly.</para>
-
-    <para os="b">Prepare Tcl for compilation:</para>
+    <para os="a">Prepare Tcl for compilation:</para>
 
 <screen><userinput>cd unix
 ./configure --prefix=/tools</userinput></screen>
 
-    <para os="d">Build the package:</para>
+    <para os="c">Build the package:</para>
 
-<screen os="e"><userinput>make</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <para os="g">Install the package:</para>
+    <para os="e">Install the package:</para>
 
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="f"><userinput>make install</userinput></screen>
 
-    <para os="i">Tcl's private header files are needed for the next
+    <para os="g">Tcl's private header files are needed for the next
     package, Expect. Install them into /tools:</para>
 
-<screen os="j"><userinput>make install-private-headers</userinput></screen>
+<screen os="h"><userinput>make install-private-headers</userinput></screen>
 
-    <para os="k">Now make a necessary symbolic link:</para>
+    <para os="i">Now make a necessary symbolic link:</para>
 
-<screen os="l"><userinput>ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen>
+<screen os="j"><userinput>ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen>
 
   </sect2>

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

@@ -26 +26 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
+<screen os="b"><userinput>cd unix
+CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>cd unix
-CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -40 +40 @@
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -57 +61 @@
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
   </sect2>