diff options
Diffstat (limited to 'ci/merge.sh')
| -rwxr-xr-x | ci/merge.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ci/merge.sh b/ci/merge.sh index 06bd986..bd1d3fe 100755 --- a/ci/merge.sh +++ b/ci/merge.sh @@ -1,2 +1,11 @@ #!/bin/bash -exit 0 +############################################################################## +# Copyright (c) 2015 EMC and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +PYTHONPATH="`pwd`/storperf":"`pwd`/tests" nosetests --with-xunit . |