Permalink
Browse files

Merge branch 'mirror'

Conflicts:
	doc/Makefile
	doc/guide.html
  • Loading branch information...
2 parents 58f946c + 16f3605 commit 5a5caf0469e90372c6b5bbcf98d317812f684936 @whart222 whart222 committed Jan 26, 2012
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+export PATH=$WORKSPACE/vpython/bin:$PATH
+g++ --version
+
+# Setup virtual Python environment
+\rm -Rf vpython
+python cxxtest/admin/virtualenv.py vpython
+#vpy/scripts/vpy_install
+vpython/bin/easy_install nose
+vpython/bin/easy_install unittest2
+vpython/bin/easy_install ply
+vpython/bin/easy_install ordereddict
+vpython/bin/easy_install gcovr
+vpython/bin/easy_install pyutilib.th
+cd cxxtest/python
+../../vpython/bin/python setup.py install
+
+# Cleanup test directory
+cd ../test
+make clean
+cd ../..
+
+# Run tests
+#export CXXTEST_GCOV_FLAGS='-fprofile-arcs -ftest-coverage'
+vpython/bin/nosetests -v -v --with-xunit --xunit-file=$WORKSPACE/TEST-cxxtest.xml -w $WORKSPACE/cxxtest/test
+
+# Generate code coverage
+#cd cxxtest
+#../vpython/bin/gcovr -v -r $WORKSPACE/cxxtest -x -o $WORKSPACE/cxxtest/test/coverage.xml --gcov-filter '.*#test#(\.\.|\^)#cxxtest#.*gcov'
+
+echo "DONE"
+
+# Cleanup old gcov files
+cd $WORKSPACE
+#\rm -f *.gcov cxxtest/*.gcov doc/*.gcov doc/examples/*.gcov
+#\rm -f *.gcno cxxtest/*.gcno doc/*.gcno doc/examples/*.gcno
+#\rm -f *.gcda cxxtest/*.gcda doc/*.gcda doc/examples/*.gcda
+cd $WORKSPACE/cxxtest/test
+make clean
+
View
@@ -16,6 +16,12 @@ A2X_OPTS := -a toc -a icons -L -d article -v --xsltproc-opts "$(XSLTPROC_OP
# Ignore errors
%.epub: %.txt anchors outputs
- a2x -f epub $(A2X_OPTS) $<
+manpages:
+ cd man; ./create_manpage;
+ cd man; asciidoc -v -d manpage ./cxxtestgen.1.txt
+ cd man; a2x -d manpage -f manpage ./cxxtestgen.1.txt
+
+all: html pdf epub manpages
all: guide.html guide.pdf guide.epub
View
@@ -32,3 +32,12 @@ used, which configures asciidoc to use the docbook XML data in the
`epub` directory. This is a bit of a hack. It apparently works
around a limitation of the MacPorts installation of asciidoc.
+
+MANPAGES
+
+The command
+
+ make manpages
+
+creates CxxTest man pages in the doc/man directory.
+
View
@@ -1529,8 +1529,8 @@ <h3 id="_test_discovery_options">4.6. Test Discovery Options</h3>
and in CxxTest 4.0 a new test discovery mechanism was added based
on the a parser for the
<a href="http://www.computing.surrey.ac.uk/research/dsrg/fog/">Flexible Object
-Generator (FOG)</a> language, which is a superset of C+<tt>. The grammar
-for the FOG language was adapted to parse C</tt>+ header files to
+Generator (FOG)</a> language, which is a superset of C++. The grammar
+for the FOG language was adapted to parse C++ header files to
identify class definitions and class inheritance relationships,
class and namespace nesting of declarations, and class methods.
This allows <tt>cxxtestgen</tt> to identify test classes that are defined
@@ -4242,7 +4242,7 @@ <h2 id="appendix_D">Appendix D: CxxTest Releases</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-01-07 20:48:27 MST
+Last updated 2012-01-07 21:40:31 MST
</div>
</div>
</body>
View
@@ -496,7 +496,7 @@ There are many limitations to this simple process for test discovery,
and in CxxTest 4.0 a new test discovery mechanism was added based
on the a parser for the
http://www.computing.surrey.ac.uk/research/dsrg/fog/[Flexible Object
-Generator (FOG)] language, which is a superset of C\++. The grammar
+Generator (FOG)] language, which is a superset of C+\+. The grammar
for the FOG language was adapted to parse C++ header files to
identify class definitions and class inheritance relationships,
class and namespace nesting of declarations, and class methods.
@@ -0,0 +1,18 @@
+#! /usr/bin/env python
+#
+# Setup the Python environment, create an asciidoc manpage, and then create the final manpage
+#
+
+import sys
+import os
+from os.path import realpath, dirname
+if sys.version_info < (3,0):
+ sys.path.insert(0, dirname(dirname(dirname(realpath(__file__))))+os.sep+'python')
+else:
+ sys.path.insert(0, dirname(dirname(dirname(realpath(__file__))))+os.sep+'python'+os.sep+'python3')
+sys.path.append(".")
+
+import cxxtest
+
+cxxtest.create_manpage()
+
View
@@ -0,0 +1,178 @@
+'\" t
+.\" Title: cxxtestgen
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\" Date: 01/21/2012
+.\" Manual: \ \&
+.\" Source: \ \&
+.\" Language: English
+.\"
+.TH "CXXTESTGEN" "1" "01/21/2012" "\ \&" "\ \&"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+cxxtestgen \- performs test discovery to create a CxxTest test runner
+.SH "SYNOPSIS"
+.sp
+cxxtestgen [options] [<filename> \&...]
+.SH "DESCRIPTION"
+.sp
+The cxxtestgen command processes C++ header files to perform test discovery, and then it creates files for the CxxTest test runner\&.
+.SH "OPTIONS"
+.PP
+\fB\-h, \-\-help\fR
+.RS 4
+show this help message and exit
+.RE
+.PP
+\fB\-\-version\fR
+.RS 4
+Write the CxxTest version\&.
+.RE
+.PP
+\fB\-o, \-\-output\fR=\fINAME\fR
+.RS 4
+Write output to file NAME\&.
+.RE
+.PP
+\fB\-w, \-\-world\fR
+.RS 4
+The label of the tests, used to name the XML results\&.
+.RE
+.PP
+\fB\-\-include\fR=\fIHEADER\fR
+.RS 4
+Include file HEADER in the test runner before other headers\&.
+.RE
+.PP
+\fB\-\-abort\-on\-fail\fR
+.RS 4
+Abort tests on failed asserts (like xUnit)\&.
+.RE
+.PP
+\fB\-\-main\fR
+.RS 4
+Specify an alternative name for the main() function\&.
+.RE
+.PP
+\fB\-\-headers\fR
+.RS 4
+Specify a filename that contains a list of header files that are processed to generate a test runner\&.
+.RE
+.PP
+\fB\-\-runner\fR=\fICLASS\fR
+.RS 4
+Create a test runner that processes test events using the class CxxTest::CLASS\&.
+.RE
+.PP
+\fB\-\-gui\fR=\fICLASS\fR
+.RS 4
+Create a GUI test runner that processes test events using the class CxxTest::CLASS\&. (deprecated)
+.RE
+.PP
+\fB\-\-error\-printer\fR
+.RS 4
+Create a test runner using the ErrorPrinter class, and allow the use of the standard library\&.
+.RE
+.PP
+\fB\-\-xunit\-printer\fR
+.RS 4
+Create a test runner using the XUnitPrinter class\&.
+.RE
+.PP
+\fB\-\-xunit\-file\fR
+.RS 4
+The file to which the XML summary is written for test runners using the XUnitPrinter class\&. The default XML filename is TEST\-<world>\&.xml, where <world> is the value of the \-\-world option\&. (default: cxxtest)
+.RE
+.PP
+\fB\-\-have\-std\fR
+.RS 4
+Use the standard library (even if not found in tests)\&.
+.RE
+.PP
+\fB\-\-no\-std\fR
+.RS 4
+Do not use standard library (even if found in tests)\&.
+.RE
+.PP
+\fB\-\-have\-eh\fR
+.RS 4
+Use exception handling (even if not found in tests)\&.
+.RE
+.PP
+\fB\-\-no\-eh\fR
+.RS 4
+Do not use exception handling (even if found in tests)\&.
+.RE
+.PP
+\fB\-\-longlong\fR=\fITYPE\fR
+.RS 4
+Use TYPE as for long long integers\&. (default: not supported)
+.RE
+.PP
+\fB\-\-no\-static\-init\fR
+.RS 4
+Do not rely on static initialization in the test runner\&.
+.RE
+.PP
+\fB\-\-template\fR=\fITEMPLATE\fR
+.RS 4
+Generate the test runner using file TEMPLATE to define a template\&.
+.RE
+.PP
+\fB\-\-root\fR
+.RS 4
+Write the main() function and global data for a test runner\&.
+.RE
+.PP
+\fB\-\-part\fR
+.RS 4
+Write the tester classes for a test runner\&.
+.RE
+.PP
+\fB\-f, \-\-fog\-parser\fR
+.RS 4
+Use new FOG C++ parser (disabled)
+.RE
+.SH "EXIT STATUS"
+.PP
+\fB0\fR
+.RS 4
+Success
+.RE
+.PP
+\fB1\fR
+.RS 4
+Failure (syntax or usage error; configuration error; document processing failure; unexpected error)\&.
+.RE
+.SH "BUGS"
+.sp
+See the CxxTest Home Page for the link to the CxxTest ticket repository\&.
+.SH "AUTHOR"
+.sp
+CxxTest was originally written by Erez Volk\&. Many people have contributed to it\&.
+.SH "RESOURCES"
+.sp
+Home page: http://cxxtest\&.com/
+.sp
+CxxTest User Guide: http://cxxtest\&.com/cxxtest/doc/guide\&.html
+.SH "COPYING"
+.sp
+Copyright (c) 2008 Sandia Corporation\&. This software is distributed under the Lesser GNU General Public License (LGPL) v2\&.1
Oops, something went wrong.

0 comments on commit 5a5caf0

Please sign in to comment.