From feb63badf13999d2417f8ea4e1fbb8140dfcd28e Mon Sep 17 00:00:00 2001 From: Steven Watanabe Date: Fri, 9 Dec 2011 19:37:53 +0000 Subject: [PATCH] Remove project-test1. It's hopelessly broken and not run by test_all.py. [SVN r75880] --- test/project-test1.jam | 18 ------ test/project-test1/dir/jamfile.jam | 10 --- test/project-test1/dir2/jamfile.jam | 9 --- test/project-test1/dir2/jamroot.jam | 4 -- test/project-test1/jamfile.jam | 10 --- test/project-test1/jamroot.jam | 6 -- test/project-test1/project-test1.jam | 21 ------ test/project-test1/readme.txt | 8 --- test/project-test1/standalone-project.jam | 12 ---- test/project_test1.py | 78 ----------------------- 10 files changed, 176 deletions(-) delete mode 100644 test/project-test1.jam delete mode 100644 test/project-test1/dir/jamfile.jam delete mode 100644 test/project-test1/dir2/jamfile.jam delete mode 100644 test/project-test1/dir2/jamroot.jam delete mode 100644 test/project-test1/jamfile.jam delete mode 100644 test/project-test1/jamroot.jam delete mode 100644 test/project-test1/project-test1.jam delete mode 100644 test/project-test1/readme.txt delete mode 100644 test/project-test1/standalone-project.jam delete mode 100644 test/project_test1.py diff --git a/test/project-test1.jam b/test/project-test1.jam deleted file mode 100644 index c2d6ae576..000000000 --- a/test/project-test1.jam +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2002, 2003 Dave Abrahams -# Copyright 2002 Rene Rivera -# Copyright 2002, 2003 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -import project ; -import targets ; -import assert ; - -project.load project-test1 ; -import project-roots ; - -project-roots.print ; - -NOTFILE all ; - - diff --git a/test/project-test1/dir/jamfile.jam b/test/project-test1/dir/jamfile.jam deleted file mode 100644 index 3434eb791..000000000 --- a/test/project-test1/dir/jamfile.jam +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2003 Dave Abrahams -# Copyright 2002 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - -project /boost-build-test-project-1/dir - : source-location src - : default-build release - ; diff --git a/test/project-test1/dir2/jamfile.jam b/test/project-test1/dir2/jamfile.jam deleted file mode 100644 index 8d1c48b65..000000000 --- a/test/project-test1/dir2/jamfile.jam +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2004 Rene Rivera -# Copyright 2002, 2003 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - -project /cool-library - : requirements /home/ghost/build/boost-cvs - ; diff --git a/test/project-test1/dir2/jamroot.jam b/test/project-test1/dir2/jamroot.jam deleted file mode 100644 index 8cfc3a28e..000000000 --- a/test/project-test1/dir2/jamroot.jam +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright 2002 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - diff --git a/test/project-test1/jamfile.jam b/test/project-test1/jamfile.jam deleted file mode 100644 index d343ba6df..000000000 --- a/test/project-test1/jamfile.jam +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2002 Dave Abrahams -# Copyright 2002 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -project /boost-build-test-project-1 - : requirements multi /home/ghost/local/include ; - -build-project dir2 ; -build-project dir ; diff --git a/test/project-test1/jamroot.jam b/test/project-test1/jamroot.jam deleted file mode 100644 index a61a11c1d..000000000 --- a/test/project-test1/jamroot.jam +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2002 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - -import builtin ; diff --git a/test/project-test1/project-test1.jam b/test/project-test1/project-test1.jam deleted file mode 100644 index 2f2aad25c..000000000 --- a/test/project-test1/project-test1.jam +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2002, 2003 Dave Abrahams -# Copyright 2002, 2003 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -import project ; -import targets ; -import assert ; -import project-roots ; - -project.load "." ; - -import standalone-project ; - -project-roots.print ; - -assert.result standalone-project : project.find /teeest : "." ; - -NOTFILE all ; - - diff --git a/test/project-test1/readme.txt b/test/project-test1/readme.txt deleted file mode 100644 index 000179924..000000000 --- a/test/project-test1/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -Copyright 2003 Dave Abrahams -Copyright 2002 Vladimir Prus -Distributed under the Boost Software License, Version 1.0. -(See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - -This tests for basic project handling -- declaring subprojects, finding -parent projects and project roots and for working project-ids. diff --git a/test/project-test1/standalone-project.jam b/test/project-test1/standalone-project.jam deleted file mode 100644 index 48249b561..000000000 --- a/test/project-test1/standalone-project.jam +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2003 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - - -import project ; - -# Convert ourself into a real project. -project.initialize $(__name__) ; - -# Now we can identify ourselfs. -project /teeest ; diff --git a/test/project_test1.py b/test/project_test1.py deleted file mode 100644 index a2a2ada18..000000000 --- a/test/project_test1.py +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/python - -# Copyright 2002 Dave Abrahams -# Copyright 2002, 2003, 2004 Vladimir Prus -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) - -import BoostBuild -import os - -t = BoostBuild.Tester("--build-system=project-test1", boost_build_path='', - pass_toolset=0) - -# This test does no modifications, so run in in the invocation dir. -os.chdir(t.original_workdir) - -expected_output1="""Project Roots: - -""" - -expected_output2="""'%(root-dir-prefix)sdir2': - - Module for project-root is 'project-root<%(root-dir-prefix)sdir2>' - -Projects: - -'/cool-library': - -* Parent project: (none) -* Requirements: /home/ghost/build/boost-cvs -* Default build: -* Source location: %(root-dir-prefix)sdir2 -* Projects to build: - -""" - -expected_output3="""'%(root-dir)s': - - Module for project-root is 'project-root<%(root-dir)s>' - -Projects: - -'/boost-build-test-project-1': - -* Parent project: (none) -* Requirements: /home/ghost/local/include multi -* Default build: -* Source location: %(root-dir)s -* Projects to build: dir dir2 - -'/boost-build-test-project-1/dir': - -* Parent project: %(root-dir)s -* Requirements: /home/ghost/local/include multi -* Default build: release -* Source location: %(root-dir-prefix)sdir/src -* Projects to build: - -""" - -# Test that correct project structure is created when jam is invoked outside of -# the source tree. -expected = (expected_output1 + expected_output2 + expected_output3) % \ - {"root-dir": "project-test1", - "root-dir-prefix": "project-test1/" } - -t.run_build_system(stdout=expected) - -# Test that correct project structure is created when jam is invoked at the top -# of the source tree. -expected = (expected_output1 + expected_output3 + expected_output2) % \ - {"root-dir": ".", - "root-dir-prefix": "" } - -os.chdir("project-test1") -t.run_build_system(stdout=expected) - -t.cleanup()