Revision: 75783
http://sourceforge.net/p/brlcad/code/75783
Author: starseeker
Date: 2020-05-13 16:36:08 +0000 (Wed, 13 May 2020)
Log Message:
-----------
Strip the prefix of the path off for less verbose reporting
Modified Paths:
--------------
brlcad/trunk/regress/repository/CMakeLists.txt
brlcad/trunk/regress/repository/repocheck.cpp
Modified: brlcad/trunk/regress/repository/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/repository/CMakeLists.txt 2020-05-13 16:28:09 UTC
(rev 75782)
+++ brlcad/trunk/regress/repository/CMakeLists.txt 2020-05-13 16:36:08 UTC
(rev 75783)
@@ -16,8 +16,9 @@
add_custom_command(
OUTPUT "${STAMP_FILE}"
COMMAND "${CMAKE_COMMAND}"
- -DLCHECK_EXEC="$<TARGET_FILE:repocheck>"
+ -DRCHECK_EXEC="$<TARGET_FILE:repocheck>"
-DL_FILE="${LOG_FILE}" -DS_FILE="${STAMP_FILE}"
-DF_LIST="${ALL_FILES_LIST}"
+ -DB_DIR="${BRLCAD_SOURCE_DIR}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/regress-repository.cmake"
)
add_custom_target(regress-repository DEPENDS ${STAMP_FILE} ${ALL_FILES_LIST})
@@ -27,9 +28,9 @@
add_test(NAME regress-repository
COMMAND "${CMAKE_COMMAND}"
- -DLCHECK_EXEC=$<TARGET_FILE:repocheck>
+ -DRCHECK_EXEC=$<TARGET_FILE:repocheck>
-DL_FILE=${LOG_FILE} -DS_FILE=${STAMP_FILE} -DF_LIST=${ALL_FILES_LIST}
- -DW_DIR=${CMAKE_CURRENT_BINARY_DIR}
+ -DB_DIR="${BRLCAD_SOURCE_DIR}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/regress-repository.cmake"
)
set_tests_properties(regress-repository PROPERTIES LABELS "Regression")
Modified: brlcad/trunk/regress/repository/repocheck.cpp
===================================================================
--- brlcad/trunk/regress/repository/repocheck.cpp 2020-05-13 16:28:09 UTC
(rev 75782)
+++ brlcad/trunk/regress/repository/repocheck.cpp 2020-05-13 16:36:08 UTC
(rev 75783)
@@ -441,10 +441,9 @@
int
-platform_symbols(std::vector<std::string> &srcs)
+platform_symbols(std::vector<std::string> &srcs, std::string &proot)
{
- bool ret = false;
-
+
const char *platforms[] {
"aix",
"apple",
@@ -474,7 +473,6 @@
NULL
};
std::map<std::string, std::regex> platform_checks;
- std::string pregex_str;
int cnt = 0;
const char *rf = platforms[cnt];
while (rf) {
@@ -537,7 +535,7 @@
//std::cout << "match on line: " << sline << "\n";
platform_entry pe;
pe.symbol = p_it->first;
- pe.file = srcs[i];
+ pe.file = srcs[i].substr(proot.length()+1);
pe.line_num = lcnt;
pe.line = sline;
instances[p_it->first].push_back(pe);
@@ -563,11 +561,13 @@
int
main(int argc, const char *argv[])
{
- if (argc != 2) {
- std::cerr << "Usage: repocheck file_list.txt\n";
+ if (argc != 3) {
+ std::cerr << "Usage: repocheck file_list.txt source_dir\n";
return -1;
}
+ std::string path_root(argv[2]);
+
std::string sfile;
std::ifstream src_file_stream;
src_file_stream.open(argv[1]);
@@ -663,13 +663,13 @@
#endif
- int h_cnt = platform_symbols(inc_files);
+ int h_cnt = platform_symbols(inc_files, path_root);
std::cout << "Found " << h_cnt << " header instances\n";
- int s_cnt = platform_symbols(src_files);
+ int s_cnt = platform_symbols(src_files, path_root);
std::cout << "Found " << s_cnt << " src instances\n";
- int b_cnt = platform_symbols(build_files);
+ int b_cnt = platform_symbols(build_files, path_root);
std::cout << "Found " << b_cnt << " build system instances\n";
-
+
int psym_cnt = h_cnt + s_cnt + b_cnt;
int expected_psym_cnt = 10;
if (psym_cnt > expected_psym_cnt) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
