Skip to content

Commit

Permalink
Merge pull request #2914 from hangshao0/work
Browse files Browse the repository at this point in the history
Fix typo and related tests
  • Loading branch information
pshipton committed Sep 18, 2018
2 parents 1ef3c3d + 0f6d2bf commit 15894d8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion runtime/nls/shrc/j9shr.nls
Original file line number Diff line number Diff line change
Expand Up @@ -2955,7 +2955,7 @@ J9NLS_SHRC_CM_PRINTSTATS_CACHE_CREATED_WITH.system_action=
J9NLS_SHRC_CM_PRINTSTATS_CACHE_CREATED_WITH.user_response=
# END NON-TRANSLATABLE

J9NLS_SHRC_SHRINIT_FAILURE_COPYING_USERNAME_TOOLONG=The cache name is to long when the user name is included. There are %d bytes left in this buffer, and your user name is %d bytes.
J9NLS_SHRC_SHRINIT_FAILURE_COPYING_USERNAME_TOOLONG=The cache name is too long when the user name is included. There are %d bytes left in this buffer, and your user name is %d bytes.
# START NON-TRANSLATABLE
J9NLS_SHRC_SHRINIT_FAILURE_COPYING_USERNAME_TOOLONG.sample_input_1=23
J9NLS_SHRC_SHRINIT_FAILURE_COPYING_USERNAME_TOOLONG.sample_input_2=45
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ set NAME=%%u%%u%%u%%u%%u%%u%%u%%u%%u%%u%%u%%u%%u%%u%%u%%u
%1\java -Xshareclasses:name=%NAME% HelloWorld 2> %TESTSCRIPT%.out

if exist %TESTSCRIPT%.out (
%1\java SimpleGrep "The cache name is to long when the user name is included." %TESTSCRIPT%.out
%1\java SimpleGrep "The cache name is too long when the user name is included." %TESTSCRIPT%.out
) else (
echo %TESTSCRIPT%: TEST FAILED: No file created
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [ ! -e $TESTSCRIPT.out ]
then
echo $TESTSCRIPT: TEST FAILED: No file created
else
if( grep "The cache name is to long when the user name is included." $TESTSCRIPT.out )
if( grep "The cache name is too long when the user name is included." $TESTSCRIPT.out )
then
echo TEST PASSED
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ sub copy_groupname_err_msg {

# error msg to indicate that the cache name could not accomodate the expansion of %u
sub copy_username_err_msg {
return "The cache name is to long when the user name is included";
return "The cache name is too long when the user name is included";
}

sub get_short_string_for_user{
Expand Down

0 comments on commit 15894d8

Please sign in to comment.