Skip to content

Make CL_CONFORMANCE_RESULTS_FILENAME Bazel-aware #2629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olestrohm-arm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make CL_CONFORMANCE_RESULTS_FILENAME Bazel-aware #2629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions test_common/harness/testHarness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@
// limitations under the License.
//
#include "testHarness.h"
#include "stringHelpers.h"
#include "compat.h"
#include <algorithm>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <cassert>
#include <deque>
#include <filesystem>
#include <mutex>
#include <set>
#include <stdexcept>
Expand All @@ -33,6 +35,8 @@
#include "imageHelpers.h"
#include "parseParameters.h"

namespace fs = std::filesystem;

#if !defined(_WIN32)
#include <sys/utsname.h>
#include <unistd.h>
Expand Down Expand Up @@ -95,11 +99,25 @@ static int saveResultsToJson(const char *suiteName, test_definition testList[],
return EXIT_SUCCESS;
}

FILE *file = fopen(fileName, "w");
fs::path file_path(fileName);

// When running under Bazel test, prepend the Bazel output directory to
// the provided path
if (nullptr != getenv("BAZEL_TEST"))
{
char *bazel_output_dir = getenv("TEST_UNDECLARED_OUTPUTS_DIR");
if (nullptr != bazel_output_dir)
{
file_path = fs::path(bazel_output_dir) / file_path;
}
}

auto file_path_str = to_string(file_path.u8string());
FILE *file = fopen(file_path_str.c_str(), "w");
if (NULL == file)
{
log_error("ERROR: Failed to open '%s' for writing results.\n",
fileName);
file_path_str.c_str());
return EXIT_FAILURE;
}

Expand Down Expand Up @@ -128,7 +146,8 @@ static int saveResultsToJson(const char *suiteName, test_definition testList[],

int ret = fclose(file) ? EXIT_FAILURE : EXIT_SUCCESS;

log_info("Saving results to %s: %s!\n", fileName, save_map[ret]);
log_info("Saving results to %s: %s!\n", file_path_str.c_str(),
save_map[ret]);

return ret;
}
Expand Down Expand Up @@ -309,6 +328,8 @@ int runTestHarnessWithCheck(int argc, const char *argv[], int testNum,
"CL_CONFORMANCE_RESULTS_FILENAME (currently '%s')\n",
fileName != NULL ? fileName : "<undefined>");
log_info("\t to save results to JSON file.\n");
log_info("\t When running in Bazel test this is relative to "
"$TEST_UNDECLARED_OUTPUTS_DIR.\n");

log_info("\n");
log_info("Test names:\n");
Expand Down