StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Jsonnet: Update with latest Sandboxed API changes

Browse Source 
This fixes some build issues due to changes in Sandboxed API and
upstream Jsonnet.

PiperOrigin-RevId: 423787176
Change-Id: Ia3b9eab6b96e2fca70531f998e441ace04f31e3e
This commit is contained in:
Christian Blichmann 2022-01-24 05:12:30 -08:00 committed by Copybara-Service
parent e4436c87e8
commit 7afaaa7c6a
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oss-internship-2020/jsonnet/CMakeLists.txt
View File

@ -32,17 +32,18 @@ add_subdirectory("${SAPI_ROOT}"
EXCLUDE_FROM_ALL) EXCLUDE_FROM_ALL)
add_sapi_library(jsonnet_sapi add_sapi_library(jsonnet_sapi
FUNCTIONS c_jsonnet_evaluate_snippet FUNCTIONS c_free_input
c_jsonnet_make
c_jsonnet_destroy c_jsonnet_destroy
c_read_input c_jsonnet_evaluate_snippet
c_write_output_file
c_jsonnet_realloc
c_jsonnet_evaluate_snippet_multi c_jsonnet_evaluate_snippet_multi
c_write_multi_output_files
c_write_output_stream
c_jsonnet_evaluate_snippet_stream c_jsonnet_evaluate_snippet_stream
c_jsonnet_fmt_snippet c_jsonnet_fmt_snippet
c_jsonnet_make
c_jsonnet_realloc
c_read_input
c_write_multi_output_files
c_write_output_file
c_write_output_stream
INPUTS jsonnet_helper.h INPUTS jsonnet_helper.h
LIBRARY jsonnet_helper LIBRARY jsonnet_helper
LIBRARY_NAME Jsonnet LIBRARY_NAME Jsonnet

4
oss-internship-2020/jsonnet/examples/jsonnet_base_transaction.cc
View File

@ -28,7 +28,7 @@ absl::Status JsonnetTransaction::Main() {
sapi::v::RemotePtr vm_pointer(jsonnet_vm); sapi::v::RemotePtr vm_pointer(jsonnet_vm);
// Read input file. // Read input file.
std::string in_file_in_sandboxee(JoinPath("/input", Basename(in_file))); std::string in_file_in_sandboxee(JoinPath("/input", Basename(in_file_)));
sapi::v::ConstCStr in_file_var(in_file_in_sandboxee.c_str()); sapi::v::ConstCStr in_file_var(in_file_in_sandboxee.c_str());
SAPI_ASSIGN_OR_RETURN(char* input, SAPI_ASSIGN_OR_RETURN(char* input,
api.c_read_input(false, in_file_var.PtrBefore())); api.c_read_input(false, in_file_var.PtrBefore()));
@ -43,7 +43,7 @@ absl::Status JsonnetTransaction::Main() {
"Jsonnet code evaluation failed."); "Jsonnet code evaluation failed.");
// Write data to file. // Write data to file.
std::string out_file_in_sandboxee(JoinPath("/output", Basename(out_file))); std::string out_file_in_sandboxee(JoinPath("/output", Basename(out_file_)));
sapi::v::ConstCStr out_file_var(out_file_in_sandboxee.c_str()); sapi::v::ConstCStr out_file_var(out_file_in_sandboxee.c_str());
sapi::v::RemotePtr output_pointer(output); sapi::v::RemotePtr output_pointer(output);
SAPI_ASSIGN_OR_RETURN( SAPI_ASSIGN_OR_RETURN(

3
oss-internship-2020/jsonnet/examples/jsonnet_multiple_files_example.cc
View File

@ -44,8 +44,7 @@ class JsonnetSapiSandbox : public JsonnetSandbox {
__NR_futex, __NR_futex,
__NR_close, __NR_close,
}) })
.AddDirectoryAt(sandbox2::file::CleanPath(&out_directory_[0]), .AddDirectoryAt(sapi::file::CleanPath(&out_directory_[0]), "/output",
"/output",
/*is_ro=*/false) /*is_ro=*/false)
.AddDirectoryAt(dirname(&in_file_[0]), "/input", true) .AddDirectoryAt(dirname(&in_file_[0]), "/input", true)
.BuildOrDie(); .BuildOrDie();

6
oss-internship-2020/jsonnet/tests/jsonnet_tests.cc
View File

@ -35,7 +35,7 @@ TEST_F(JsonnetTest, One_file_no_dependencies) {
constexpr char kOutputToRead[] = "tests_output/arith_output"; constexpr char kOutputToRead[] = "tests_output/arith_output";
constexpr char kOutputToExpect[] = "tests_expected_output/arith.golden"; constexpr char kOutputToExpect[] = "tests_expected_output/arith.golden";
Read_input(kInputFile); ReadInput(kInputFile);
EvaluateJsonnetCode(kBase, true); EvaluateJsonnetCode(kBase, true);
WriteOutput(kOutputFile, kBase); WriteOutput(kOutputFile, kBase);
@ -56,8 +56,8 @@ TEST_F(JsonnetTest, One_file_some_dependencies) {
EvaluateJsonnetCode(kBase, true); EvaluateJsonnetCode(kBase, true);
WriteOutput(kOutputFile, kBase); WriteOutput(kOutputFile, kBase);
const std::string produced_output = Read_output(kOutputToRead); const std::string produced_output = ReadOutput(kOutputToRead);
const std::string expected_output = Read_output(kOutputToExpect); const std::string expected_output = ReadOutput(kOutputToExpect);
ASSERT_STREQ(produced_output.c_str(), expected_output.c_str()); ASSERT_STREQ(produced_output.c_str(), expected_output.c_str());
} }

10
oss-internship-2020/jsonnet/tests/jsonnet_tests_utils.cc
View File

@ -22,13 +22,13 @@ void JsonnetTestHelper::TestSetUp() {
ASSERT_GE(error, 0); ASSERT_GE(error, 0);
std::pair<absl::string_view, absl::string_view> parts_of_path = std::pair<absl::string_view, absl::string_view> parts_of_path =
sandbox2::file::SplitPath(buffer); sapi::file::SplitPath(buffer);
absl::string_view binary_path = parts_of_path.first; absl::string_view binary_path = parts_of_path.first;
std::string input_path = std::string input_path =
sandbox2::file::JoinPath(binary_path, "tests_input", "dummy_input"); sapi::file::JoinPath(binary_path, "tests_input", "dummy_input");
std::string output_path = std::string output_path =
sandbox2::file::JoinPath(binary_path, "tests_output", "dummy_input"); sapi::file::JoinPath(binary_path, "tests_output", "dummy_input");
// Set up sandbox and api. // Set up sandbox and api.
sandbox_ = absl::make_unique<JsonnetBaseSandbox>(input_path, output_path); sandbox_ = absl::make_unique<JsonnetBaseSandbox>(input_path, output_path);
@ -70,8 +70,8 @@ void JsonnetTestHelper::ReadInput(const char* filename) {
} }
// Evaluates jsonnet code. // Evaluates jsonnet code.
void JsonnetTestHelper::Evaluate_jsonnet_code(Evaluation type, void JsonnetTestHelper::EvaluateJsonnetCode(Evaluation type,
bool expected_correct) { bool expected_correct) {
sapi::v::ConstCStr in_file_var(input_filename_in_sandboxee_.c_str()); sapi::v::ConstCStr in_file_var(input_filename_in_sandboxee_.c_str());
sapi::v::Int error; sapi::v::Int error;
char* output_ptr; char* output_ptr;