summaryrefslogtreecommitdiff
path: root/src/engine/SCons/SConfTests.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2012-08-20 23:30:35 +0200
committerLuca Falavigna <dktrkranz@debian.org>2012-08-20 23:30:35 +0200
commit82c4addb364fffb1c647ff7e5fab201000719305 (patch)
treecc244c59579c58d9e8df6e157d8fc49510e0f494 /src/engine/SCons/SConfTests.py
parentfa0c16e75fd6770db0a9eb67a37a9b420ba3fa4f (diff)
parent3d529f4ea2b0de42aa2144dbe904e564b7b0b813 (diff)
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
Diffstat (limited to 'src/engine/SCons/SConfTests.py')
-rw-r--r--src/engine/SCons/SConfTests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py
index d7dc827..59f5953 100644
--- a/src/engine/SCons/SConfTests.py
+++ b/src/engine/SCons/SConfTests.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/SConfTests.py 5357 2011/09/09 21:31:03 bdeegan"
+__revision__ = "src/engine/SCons/SConfTests.py issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo"
import SCons.compat
@@ -697,6 +697,8 @@ int main() {
assert r, "__cplusplus not declared in C++ ??"
r = sconf.CheckDeclaration('__cplusplus', language = 'C')
assert not r, "__cplusplus declared in C ??"
+ r = sconf.CheckDeclaration('unknown', language = 'Unknown')
+ assert not r, "unknown language was supported ??"
finally:
sconf.Finish()