Browse Source

scons: fix check environment

if os.environ is a special class the scons.Environment Clone() doesn't
work properly.

show builddir in prepare.sh so we can actually see it works.
master
Stefan Bühler 1 month ago
parent
commit
5515bb2a08
2 changed files with 3 additions and 1 deletions
  1. +1
    -1
      SConstruct
  2. +2
    -0
      tests/prepare.sh

+ 1
- 1
SConstruct View File

@@ -273,7 +273,7 @@ vars.AddVariables(
)

env = Environment(
ENV = os.environ,
ENV = dict(os.environ), # make sure we have a dict here so .Clone() works properly
variables = vars,
CPPPATH = Split('#sconsbuild/build')
)


+ 2
- 0
tests/prepare.sh View File

@@ -10,6 +10,8 @@ if test "x${top_builddir}" = "x"; then
top_builddir=..
fi

echo "Testing in build directory: '${top_builddir}' and cwd: '$(pwd)'"

tmpdir="${top_builddir}/tests/tmp/lighttpd"

# create test-framework


Loading…
Cancel
Save