Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xpressive
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
la
platform
external
boost-submodules
xpressive
Commits
6fa671d7
Commit
6fa671d7
authored
7 years ago
by
Peter Dimov
Browse files
Options
Downloads
Patches
Plain Diff
Pass regress.txt properly to the run rule
parent
09f1449d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
test/Jamfile.v2
+4
-4
4 additions, 4 deletions
test/Jamfile.v2
test/regress.ipp
+5
-15
5 additions, 15 deletions
test/regress.ipp
with
9 additions
and
19 deletions
test/Jamfile.v2
+
4
−
4
View file @
6fa671d7
...
...
@@ -27,10 +27,10 @@ project
;
test-suite "xpressive"
: [ run regress.cpp : : : <toolset>msvc:<cxxflags>/bigobj
<dependency>regress.txt
]
[ run regress_u.cpp : : : <toolset>msvc:<cxxflags>/bigobj
<dependency>regress.txt
]
[ run c_traits.cpp : : : <toolset>msvc:<cxxflags>/bigobj
<dependency>regress.txt
]
[ run c_traits_u.cpp : : : <toolset>msvc:<cxxflags>/bigobj
<dependency>regress.txt
]
: [ run regress.cpp : :
regress.txt
: <toolset>msvc:<cxxflags>/bigobj ]
[ run regress_u.cpp : :
regress.txt
: <toolset>msvc:<cxxflags>/bigobj ]
[ run c_traits.cpp : :
regress.txt
: <toolset>msvc:<cxxflags>/bigobj ]
[ run c_traits_u.cpp : :
regress.txt
: <toolset>msvc:<cxxflags>/bigobj ]
[ run test1.cpp ]
[ run test2.cpp ]
[ run test3.cpp ]
...
...
This diff is collapsed.
Click to expand it.
test/regress.ipp
+
5
−
15
View file @
6fa671d7
...
...
@@ -384,25 +384,13 @@ void run_test()
#endif
}
static char const * s_argv1;
///////////////////////////////////////////////////////////////////////////////
// open_test
bool open_test()
{
// This test-file is usually run from either $BOOST_ROOT/status, or
// $BOOST_ROOT/libs/xpressive/test. Therefore, the relative path
// to the data file this test depends on will be one of two
// possible paths.
// first assume we are being run from boost_root/status
in.open("../libs/xpressive/test/regress.txt");
if(!in.good())
{
// couldn't find the data file so try to find the data file from the test dir
in.clear();
in.open("./regress.txt");
}
in.open( s_argv1? s_argv1: "regress.txt" );
return in.good();
}
...
...
@@ -432,6 +420,8 @@ void test_main()
//
test_suite* init_unit_test_suite( int argc, char* argv[] )
{
s_argv1 = argv[1];
test_suite *test = BOOST_TEST_SUITE("basic regression test");
test->add(BOOST_TEST_CASE(&test_main));
return test;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment