Commit 303b380d authored by Matt Roper's avatar Matt Roper Committed by Marius Vlad

igt_core: Search "." as final fallback for igt_fopen_data()

Some validation teams seem to run tests out of source directories that
have been nfs mounted or rsync'd to different locations on the target
machine.  This causes the igt_srcdir that the tests were built with to
be invalid on the machine the tests get run on.  Add the current
directory as a final fallback for data file searches.

Reference: https://bugs.freedesktop.org/show_bug.cgi?id=92248
Cc: Humberto Israel Perez Rodriguez <humberto.i.perez.rodriguez@intel.com>
Signed-off-by: Matt Roper's avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: 's avatarMarius Vlad <marius.c.vlad@intel.com>
parent 04b8f0e0
......@@ -1882,6 +1882,10 @@ FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir,
snprintf(path, sizeof(path), "%s/%s", igt_srcdir, filename);
fp = fopen(path, "r");
}
if (!fp) {
snprintf(path, sizeof(path), "./%s", filename);
fp = fopen(path, "r");
}
if (!fp)
igt_critical("Could not open data file \"%s\": %s", filename,
......
......@@ -842,8 +842,8 @@ FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir,
* igt_fopen_data:
* @filename: filename to open.
*
* Open a datafile for test, first try from installation directory
* then from build directory.
* Open a datafile for test, first try from installation directory,
* then from build directory, and finally from current directory.
*/
#define igt_fopen_data(filename) \
__igt_fopen_data(IGT_SRCDIR, IGT_DATADIR, filename)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment