From 193a7d8b16658e768514d43b1161c8d2d02d6216 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 20 Jul 2019 11:13:14 +0100 Subject: Update to use self for testing --- src/Jamfile.jam | 4 ++++ src/repo.cpp | 7 +++++-- unittests/core.cpp | 18 +++++++++--------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/Jamfile.jam b/src/Jamfile.jam index db6267c..4cf083d 100644 --- a/src/Jamfile.jam +++ b/src/Jamfile.jam @@ -1,3 +1,5 @@ +# Testing +path-constant gitdir : ../.git ; lib gitfs : [ glob *.cpp ] @@ -6,6 +8,8 @@ lib gitfs : ..//icetray ..//git2 ..//netfs-api +# Testing + ROOT=\"$(gitdir)\" : : ..//netfs-api ; diff --git a/src/repo.cpp b/src/repo.cpp index 299f2ce..4c2a13f 100644 --- a/src/repo.cpp +++ b/src/repo.cpp @@ -4,9 +4,12 @@ #include "blob.h" #include "dir.h" +// Testing +#include + GitFS::Repo::Repo() : - repo(Git::RepositoryOpenBare("/usr/portage/.git")), - commit(Git::CommitLookup(repo, Git::OidParse("97a435f30472eb941f96234d274b3aeb492e2793"))), + repo(Git::RepositoryOpenBare(rootDir)), + commit(Git::CommitLookup(repo, Git::OidParse("9197cb3c6e58e6f24deb0af326f695aac87bc36d"))), tree(Git::TreeLookup(repo, *git_commit_tree_id(commit.get()))) { } diff --git a/unittests/core.cpp b/unittests/core.cpp index 9b38dfe..aad6b65 100644 --- a/unittests/core.cpp +++ b/unittests/core.cpp @@ -28,17 +28,17 @@ BOOST_AUTO_TEST_CASE( access ) BOOST_CHECK_EQUAL(EACCES, v->access(env, "/", W_OK)); BOOST_CHECK_EQUAL(0, v->access(env, "/", X_OK)); - BOOST_CHECK_EQUAL(0, v->access(env, "/metadata", R_OK)); - BOOST_CHECK_EQUAL(EACCES, v->access(env, "/metadata", W_OK)); - BOOST_CHECK_EQUAL(0, v->access(env, "/metadata", X_OK)); + BOOST_CHECK_EQUAL(0, v->access(env, "/src", R_OK)); + BOOST_CHECK_EQUAL(EACCES, v->access(env, "/src", W_OK)); + BOOST_CHECK_EQUAL(0, v->access(env, "/src", X_OK)); - BOOST_CHECK_EQUAL(0, v->access(env, "/metadata/timestamp.chk", R_OK)); - BOOST_CHECK_EQUAL(EACCES, v->access(env, "/metadata/timestamp.chk", W_OK)); - BOOST_CHECK_EQUAL(EACCES, v->access(env, "/metadata/timestamp.chk", X_OK)); + BOOST_CHECK_EQUAL(0, v->access(env, "/src/Jamfile.jam", R_OK)); + BOOST_CHECK_EQUAL(EACCES, v->access(env, "/src/Jamfile.jam", W_OK)); + BOOST_CHECK_EQUAL(EACCES, v->access(env, "/src/Jamfile.jam", X_OK)); - BOOST_CHECK_EQUAL(0, v->access(env, "/app-antivirus/skyldav/files/skyldav.initd", R_OK)); - BOOST_CHECK_EQUAL(EACCES, v->access(env, "/app-antivirus/skyldav/files/skyldav.initd", W_OK)); - BOOST_CHECK_EQUAL(0, v->access(env, "/app-antivirus/skyldav/files/skyldav.initd", X_OK)); + BOOST_CHECK_EQUAL(0, v->access(env, "/unittests/fixtures/executable", R_OK)); + BOOST_CHECK_EQUAL(EACCES, v->access(env, "/unittests/fixtures/executable", W_OK)); + BOOST_CHECK_EQUAL(0, v->access(env, "/unittests/fixtures/executable", X_OK)); BOOST_CHECK_EQUAL(ENOENT, v->access(env, "/missing", R_OK)); BOOST_CHECK_EQUAL(EACCES, v->access(env, "/missing", W_OK)); -- cgit v1.2.3