diff options
| author | Robert Collins <robertc@robertcollins.net> | 2009-05-08 19:53:16 +1000 |
|---|---|---|
| committer | Robert Collins <robertc@robertcollins.net> | 2009-05-08 19:53:16 +1000 |
| commit | 8967de7280e3ac990779e8b51674d2ce9f33b341 (patch) | |
| tree | 4763aa7029b48537f117833d95b32289529bef7a /shell | |
| parent | a5a8f00dc293dfdda2ebc2f198bb3d3434e6b75c (diff) | |
| parent | db8ea36ec0ae0200e8f8f2de90a22f475762b166 (diff) | |
| download | subunit-git-8967de7280e3ac990779e8b51674d2ce9f33b341.tar.gz | |
Merge autoconf transition and jaunty build updates.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/SConscript | 5 | ||||
| -rwxr-xr-x | shell/tests/test_function_output.sh | 2 | ||||
| -rwxr-xr-x | shell/tests/test_source_library.sh | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/shell/SConscript b/shell/SConscript deleted file mode 100644 index bf585eb..0000000 --- a/shell/SConscript +++ /dev/null @@ -1,5 +0,0 @@ -Import('*') -# describe what we need for Shell - -shell_lib_installdir = DESTDIR + '/share/subunit' -env.Alias('install', [Install(shell_lib_installdir, 'share/subunit.sh')]) diff --git a/shell/tests/test_function_output.sh b/shell/tests/test_function_output.sh index 787281a..068abf7 100755 --- a/shell/tests/test_function_output.sh +++ b/shell/tests/test_function_output.sh @@ -27,7 +27,7 @@ # have not, this test script may well fail strangely. # import the library. -. shell/share/subunit.sh +. ${SHELL_SHARE}subunit.sh echo 'test: subunit_start_test output' func_output=$(subunit_start_test "foo bar") diff --git a/shell/tests/test_source_library.sh b/shell/tests/test_source_library.sh index 264d5d2..81eef83 100755 --- a/shell/tests/test_source_library.sh +++ b/shell/tests/test_source_library.sh @@ -26,7 +26,7 @@ echo 'test: shell bindings can be sourced' # if any output occurs, this has failed to source cleanly -source_output=$(. shell/share/subunit.sh 2>&1) +source_output=$(. ${SHELL_SHARE}subunit.sh 2>&1) if [ $? == 0 -a "x$source_output" = "x" ]; then echo 'success: shell bindings can be sourced' else @@ -37,7 +37,7 @@ else fi # now source it for real -. shell/share/subunit.sh +. ${SHELL_SHARE}subunit.sh # we should have a start_test function echo 'test: subunit_start_test exists' |