diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2020-03-26 12:48:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 12:48:53 -0400 |
| commit | 6590e30a998f8390c6e18d3686e6075b09653e38 (patch) | |
| tree | 2d5d73c7cd50863cf08539cce5859c810fcf854e | |
| parent | 2f76514854baec8c30a77316d7a9f0d4d5f11a95 (diff) | |
| parent | 4b8f46f02a12ba9f342985539703a94a16702311 (diff) | |
| download | spmc-6590e30a998f8390c6e18d3686e6075b09653e38.tar.gz | |
Merge pull request #4 from jhunkeler/e2e1
More smoke tests
| -rwxr-xr-x | .circleci/test_spm.sh | 27 | ||||
| -rw-r--r-- | lib/internal_cmd.c | 2 |
2 files changed, 26 insertions, 3 deletions
diff --git a/.circleci/test_spm.sh b/.circleci/test_spm.sh index f70b60f..bb70212 100755 --- a/.circleci/test_spm.sh +++ b/.circleci/test_spm.sh @@ -1,6 +1,6 @@ -#!/bin/bash -set -e +#!/bin/bash -e +export PREFIX=/tmp/root export SHELL=/bin/bash cd build @@ -11,3 +11,26 @@ ctest3 -V spm --list spm --search zlib + +spm --verbose --yes --root $PREFIX --install python + +set +x +echo ACTIVATING ROOT: $PREFIX +spm --cmd mkruntime $PREFIX > $PREFIX/bin/activate || exit 1 +source $PREFIX/bin/activate || exit 1 +echo OK! +set -x + +which python3 + +python3 -V + +python3 -c 'from sysconfig import get_config_vars; from pprint import pprint; pprint(get_config_vars())' + +python3 -m ensurepip + +pip3 --version + +pip3 install --upgrade pip setuptools + +pip3 --version diff --git a/lib/internal_cmd.c b/lib/internal_cmd.c index a192ccf..a75ebe2 100644 --- a/lib/internal_cmd.c +++ b/lib/internal_cmd.c @@ -186,7 +186,7 @@ int mkruntime_interface(int argc, char **argv) { runtime_set(rt, "PKG_CONFIG_PATH", "$SPM_PKGCONFIG:$PKG_CONFIG_PATH"); runtime_set(rt, "ACLOCAL_PATH", "${SPM_DATA}/aclocal"); - char *spm_ccpath = join((char *[]) {fs->bindir, "gcc"}, DIRSEPS); + char *spm_ccpath = join((char *[]) {fs->bindir, "gcc", NULL}, DIRSEPS); if (exists(spm_ccpath) == 0) { runtime_set(rt, "CC", "$SPM_BIN/gcc"); } |