1 files changed, 30 insertions, 2 deletions
diff --git a/src/engine/SCons/Options/OptionsTests.py b/src/engine/SCons/Options/OptionsTests.py
index 95bd1cd..5ec9d7a 100644
--- a/src/engine/SCons/Options/OptionsTests.py
+++ b/src/engine/SCons/Options/OptionsTests.py
@@ -516,9 +516,37 @@ B 42 54 b - alpha test ['B']
         assert text == expectAlpha, text
 
 
-    
+
+class UnknownOptionsTestCase(unittest.TestCase):
+
+    def test_unknown(self):
+        """Test the UnknownOptions() method"""
+        opts = SCons.Options.Options()
         
+        opts.Add('ANSWER',
+                 'THE answer to THE question',
+                 "42")
+
+        args = {
+            'ANSWER'    : 'answer',
+            'UNKNOWN'   : 'unknown',
+        }
+
+        env = Environment()
+        opts.Update(env, args)
+
+        r = opts.UnknownOptions()
+        assert r == {'UNKNOWN' : 'unknown'}, r
+        assert env['ANSWER'] == 'answer', env['ANSWER']
+
+
+
 if __name__ == "__main__":
-    suite = unittest.makeSuite(OptionsTestCase, 'test_')
+    suite = unittest.TestSuite()
+    tclasses = [ OptionsTestCase,
+                 UnknownOptionsTestCase ]
+    for tclass in tclasses:
+        names = unittest.getTestCaseNames(tclass, 'test_')
+        suite.addTests(map(tclass, names))
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)