summaryrefslogtreecommitdiffstats
path: root/tests/SConstruct
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2015-01-04 20:20:40 +0200
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2015-01-04 20:20:40 +0200
commitcc3c8732fd3f8505f46802dd54bd4a21c79b72aa (patch)
tree921002e19cb4f3afa19eda0332ef78e90b9c2c5e /tests/SConstruct
parent7135e2797a80f224541080117313088273f02cad (diff)
Actually make the protoc version check work
Diffstat (limited to 'tests/SConstruct')
-rw-r--r--tests/SConstruct6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/SConstruct b/tests/SConstruct
index 61ce0c37..d8ab9ab0 100644
--- a/tests/SConstruct
+++ b/tests/SConstruct
@@ -73,11 +73,9 @@ if not env.GetOption('clean'):
conf.env.Append(PROTOCPATH = '/usr/include')
# Check protoc version
- status, output = conf.TryAction('protoc --version')
+ status, output = conf.TryAction('$PROTOC --version > $TARGET')
if status:
- conf.env.Append(PROTOC_VERSION = output)
- else:
- conf.env.Append(PROTOC_VERSION = "")
+ conf.env['PROTOC_VERSION'] = output
# Check if libmudflap is available (only with GCC)
if 'gcc' in env['CC']: