diff options
| -rw-r--r-- | test/bootstrap/TARGETS | 45 | ||||
| -rwxr-xr-x[-rw-r--r--] | test/bootstrap/test-bootstrap-pkgconfig.sh (renamed from test/bootstrap/test-bootstrap-prebuilt.sh) | 5 | ||||
| -rwxr-xr-x | test/bootstrap/test-mixed-bootstrap.sh | 7 | ||||
| -rwxr-xr-x | test/bootstrap/test-symlink-bootstrap.sh | 8 |
4 files changed, 34 insertions, 31 deletions
diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS index a3c34307..9018ccbf 100644 --- a/test/bootstrap/TARGETS +++ b/test/bootstrap/TARGETS @@ -43,42 +43,39 @@ , "body": {"type": "env", "vars": ["TEST_ENV", "SUFFIX"]} } } -, "well_known_protos": - { "type": ["@", "rules", "data", "staged"] - , "srcs": [["@", "protoc", "", "well_known_protos"]] - , "stage": ["proto"] - } , "distro-bootstrap-deps": - { "type": "stage-deps" - , "prefix": ["LOCALBASE"] - , "libs": - [ ["@", "cli11", "", "cli11"] - , ["@", "json", "", "json"] + { "type": "install" + , "dirs": [["just_cc_deps", "LOCALBASE"], ["just_other_deps", "LOCALBASE"]] + , "tainted": ["test"] + } +, "just_cc_deps": + { "type": ["@", "rules", "CC", "install-with-deps"] + , "targets": + [ ["@", "json", "", "json"] , ["@", "fmt", "", "fmt"] - , ["@", "ssl", "", "ssl"] - , ["@", "grpc", "", "grpc++"] - , ["@", "grpc", "", "grpc++_codegen_proto"] - , ["@", "bazel_remote_apis", "", "remote_execution_proto"] , ["@", "gsl-lite", "", "gsl-lite"] - , ["@", "protoc", "", "C++ runtime"] + , ["@", "cli11", "", "cli11"] + , ["@", "ssl", "", "crypto"] , ["", "libgit2"] + , ["@", "protoc", "", "protoc"] + , ["@", "protoc", "", "libprotobuf"] + , ["@", "grpc", "", "grpc++"] + , ["@", "grpc", "", "grpc_cpp_plugin"] ] - , "bins": - [ ["@", "protoc", "", "protoc"] - , ["@", "grpc", "src/compiler", "grpc_cpp_plugin"] - ] + } +, "just_other_deps": + { "type": ["test/bootstrap", "stage-deps"] , "protos": [ ["@", "bazel_remote_apis", "", "remote_execution_proto"] , ["@", "googleapis", "", "google_bytestream_proto"] ] - , "deps": ["well_known_protos"] } , "staged-sources": {"type": "install", "dirs": [[["", "bootstrap-src"], "srcs/just"]]} -, "prebuilt-test": +, "pkgconfig-test": { "type": ["@", "rules", "shell/test", "script"] - , "name": ["bootstrap-test-prebuilt"] - , "test": ["test-bootstrap-prebuilt.sh"] + , "name": ["bootstrap-test-pkgconfig"] + , "test": ["test-bootstrap-pkgconfig.sh"] , "deps": ["distro-bootstrap-deps", "staged-sources"] } , "mixed-test": @@ -104,7 +101,7 @@ [ "bundled-test" , "bundled-test-debug" , "bundled-test-gnu" - , "prebuilt-test" + , "pkgconfig-test" , "mixed-test" , "symlink-test" ] diff --git a/test/bootstrap/test-bootstrap-prebuilt.sh b/test/bootstrap/test-bootstrap-pkgconfig.sh index 4b78ede8..3087d380 100644..100755 --- a/test/bootstrap/test-bootstrap-prebuilt.sh +++ b/test/bootstrap/test-bootstrap-pkgconfig.sh @@ -33,7 +33,10 @@ mkdir -p ${TEST_OUT_DIR} # bootstrap command -env LOCALBASE=${LOCALBASE} PACKAGE=YES python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR} +env LOCALBASE=${LOCALBASE} \ + PACKAGE=YES \ + JUST_BUILD_CONF='{"COMPILER_FAMILY":"clang", "PKG_CONFIG_ARGS":["--define-prefix"]}' \ + python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR} 2>&1 # Do some sanity checks with the binary diff --git a/test/bootstrap/test-mixed-bootstrap.sh b/test/bootstrap/test-mixed-bootstrap.sh index 86d47896..61b1f5ea 100755 --- a/test/bootstrap/test-mixed-bootstrap.sh +++ b/test/bootstrap/test-mixed-bootstrap.sh @@ -48,8 +48,11 @@ cp distdir/fmt-9.1.0.zip "${DISTDIR}" # bootstrap command -env LOCALBASE=${LOCALBASE} PACKAGE=YES NON_LOCAL_DEPS='["gsl-lite", "fmt"]' \ - python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR} ${DISTDIR} +env LOCALBASE=${LOCALBASE} \ + PACKAGE=YES \ + NON_LOCAL_DEPS='["gsl-lite", "fmt"]' \ + JUST_BUILD_CONF='{"COMPILER_FAMILY":"clang", "PKG_CONFIG_ARGS":["--define-prefix"]}' \ + python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR} ${DISTDIR} 2>&1 # Do some sanity checks with the binary diff --git a/test/bootstrap/test-symlink-bootstrap.sh b/test/bootstrap/test-symlink-bootstrap.sh index df10c528..dc541fe4 100755 --- a/test/bootstrap/test-symlink-bootstrap.sh +++ b/test/bootstrap/test-symlink-bootstrap.sh @@ -32,8 +32,6 @@ readonly TEST_BUILD_ROOT=${TMPDIR}/.just mkdir -p ${TEST_BUILD_ROOT} readonly TEST_OUT_DIR=${TMPDIR}/work-test-out mkdir -p ${TEST_OUT_DIR} -readonly DISTDIR=${TMPDIR}/distdir -mkdir -p "${DISTDIR}" # Set up local base, adding some symbolic links @@ -50,8 +48,10 @@ ln -s ${UNRELATED_FILE} ${LOCALBASE}/lib/libfoo.so # bootstrap command -env LOCALBASE=${LOCALBASE} PACKAGE=YES \ - python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR} ${DISTDIR} +env LOCALBASE=${LOCALBASE} \ + PACKAGE=YES \ + JUST_BUILD_CONF='{"COMPILER_FAMILY":"clang", "PKG_CONFIG_ARGS":["--define-prefix"]}' \ + python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR} 2>&1 # Do some sanity checks with the binary |