Fix test/scan-once.py for the recent Export change.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@658 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index b943cef484d3b7a559c5b592adeb90a4e74fedbc..d8f2144372c150a2897fb1627033752603492693 100644 (file)
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -34,6 +34,13 @@ RELEASE 0.14 - XXX
     have been deprecated.  The new names are TargetSignatures() and
     SourceSignatures().
 
+  - The Export() function and the exported variables argument of
+    SConscript() now search for variables using the same rules as
+    Python: local first, then global.  If you are calling Export() or
+    SConscript() from a module imported directly into an SConscript
+    file, you may need to modify the module to make the previously
+    global variables available to your Export() or SConscript() call.
+
   Please note the following important changes since release 0.11:
 
   - The default behavior of SCons is now to change to the directory in

diff --git a/test/scan-once.py b/test/scan-once.py
index ffd379bec562100d291354457e648ec45870a293..ba147cf8c059a9dee7be090eee0a535ecda0055e 100644 (file)
--- a/test/scan-once.py
+++ b/test/scan-once.py
@@ -160,7 +160,7 @@ Mylib.AddLibDirs(env, "/via/Mylib.AddLibPath")
 env.Append(LIBPATH = [e["EXPORT_LIB"]])
 env.Append(LIBPATH = [e["REF_LIB"]])
 
-Mylib.Subdirs("src")
+Mylib.Subdirs(env, "src")
 """ % test.workpath('SLF'))
 
 test.write(['SLF', 'Mylib.py'], """\
@@ -170,7 +170,7 @@ import re
 import SCons.Environment
 import SCons.Script.SConscript
 
-def Subdirs(dirlist):
+def Subdirs(env, dirlist):
     for file in _subconf_list(dirlist):
         SCons.Script.SConscript.SConscript(file, "env")
 
@@ -262,8 +262,8 @@ Import("env")
 
 #env = env.Copy()    # Yes, clobber intentionally
 #Make environment changes, such as: Mylib.AddCFlags(env, "-g -D_TEST")
-#Mylib.Subdirs("lib_a lib_b lib_mergej prog_x")
-Mylib.Subdirs("lib_geng")
+#Mylib.Subdirs(env, "lib_a lib_b lib_mergej prog_x")
+Mylib.Subdirs(env, "lib_geng")
 
 env = env.Copy()    # Yes, clobber intentionally
 # --- End SConscript boilerplate ---
@@ -279,7 +279,7 @@ Import("env")
 
 #env = env.Copy()    # Yes, clobber intentionally
 #Make environment changes, such as: Mylib.AddCFlags(env, "-g -D_TEST")
-#Mylib.Subdirs("foo_dir")
+#Mylib.Subdirs(env, "foo_dir")
 
 env = env.Copy()    # Yes, clobber intentionally
 # --- End SConscript boilerplate ---