Skip to content

Commit

Permalink
(move tool) fix make check rule to allow edg 4.12+ gcc 4.9
Browse files Browse the repository at this point in the history
* comment out a warning
* fix typo in Makefile.am
  • Loading branch information
chunhualiao committed Dec 6, 2017
1 parent 68696a6 commit 7bed0dc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion tests/nonsmoke/functional/moveDeclarationTool/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ MOVE_MERGE_DECLS_TESTCODES_FULLY_SUPPORTED_RESULTS = $(addprefix rose_v2_, ${MOV
#MOVE_MERGE_DECLS_TESTCODES_PARTIALLY_SUPPORTED_RESULTS = $(addprefix rose_v2_, ${MOVE_DECLS_TESTCODES_PARTIALLY_SUPPORTED})

MOVE_MERGE_DECLS_NO_VAR_NORM_TESTCODES_FULLY_SUPPORTED_RESULTS = $(addprefix rose_v3_, ${MOVE_DECLS_TESTCODES_FULLY_SUPPORTED})
iSSING_MOVE_DECLS_TESTCODES_RESULTS = \
PASSING_MOVE_DECLS_TESTCODES_RESULTS = \
$(MOVE_DECLS_TESTCODES_FULLY_SUPPORTED_RESULTS)
# $(MOVE_DECLS_TESTCODES_PARTIALLY_SUPPORTED_RESULTS)
# DQ (12/23/2014): Added tests specific to use of move tool with token-based unparsing.
Expand Down Expand Up @@ -418,6 +418,7 @@ if USING_GNU_COMPILER
if ROSE_USING_GCC_VERSION_LATER_4_8
@echo "moveDeclarationTool tests require configuration with either EDG version 4.9 and GNU version 4.8 or backend compiler or EDG 4.12 and 4.8 or any later GNU compiler."
@echo "moveDeclarationTool tests using EDG 4.12 and any supported backend compiler are allowed."
@$(MAKE) move_diff_check
endif # ROSE_USING_GCC_VERSION_LATER_4_8
else
@echo "ROSE_USE_EDG_VERSION_4_9 == false"
Expand Down
2 changes: 1 addition & 1 deletion tools/moveDeclarationToInnermostScope.C
Original file line number Diff line number Diff line change
Expand Up @@ -1740,7 +1740,7 @@ void copyMoveVariableDeclaration(SgVariableDeclaration* decl, std::vector <SgSco
bottom_scope = bottom_scope->get_scope();
if (isSgForStatement(bottom_scope)||isSgDoWhileStmt(bottom_scope) || isSgWhileStmt(bottom_scope))
{
cout<<"Warning: aggressive declaration moving across a loop boundary at line "<< bottom_scope->get_file_info()->get_line()<<endl;
// cout<<"Warning: aggressive declaration moving across a loop boundary at line "<< bottom_scope->get_file_info()->get_line()<<endl;
#if 0
// DQ (12/26/2014): commented out to avoid overly verbose output.
cout<<"The declaration in question has the following file info:"<<endl;
Expand Down

0 comments on commit 7bed0dc

Please sign in to comment.