Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* posix/tst-chmod.c (do_test): Account for people running the
	tests as root.
  • Loading branch information
Ulrich Drepper committed Oct 27, 2000
1 parent 44b6044 commit 5836344
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 7 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2000-10-26 Ulrich Drepper <drepper@redhat.com>

* posix/tst-chmod.c (do_test): Account for people running the
tests as root.

* locale/langinfo.h (THOUSEP): Define this and don't duplicate
definition of THOUSANDS_SEP.

Expand Down
20 changes: 19 additions & 1 deletion locale/tst-C-locale.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Tests of X and POSIX locale contents.
/* Tests of C and POSIX locale contents.
Copyright (C) 2000 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2000.
Expand Down Expand Up @@ -151,6 +151,12 @@ run_test (const char *locname)
STRTEST (T_FMT, "%H:%M:%S");
STRTEST (T_FMT_AMPM, "%I:%M:%S %p");

STRTEST (RADIXCHAR, ".");
STRTEST (THOUSEP, "");

STRTEST (YESEXPR, "^[yY]");
STRTEST (NOEXPR, "^[nN]");

/* Extensions. */
WSTRTEST (_NL_WABDAY_1, L"Sun");
WSTRTEST (_NL_WABDAY_2, L"Mon");
Expand Down Expand Up @@ -200,6 +206,18 @@ run_test (const char *locname)
STRTEST (_DATE_FMT, "%a %b %e %H:%M:%S %Z %Y");
WSTRTEST (_NL_W_DATE_FMT, L"%a %b %e %H:%M:%S %Z %Y");

STRTEST (INT_CURR_SYMBOL, "");
STRTEST (CURRENCY_SYMBOL, "");
STRTEST (MON_DECIMAL_POINT, "");
STRTEST (MON_THOUSANDS_SEP, "");
STRTEST (MON_GROUPING, "");
STRTEST (POSITIVE_SIGN, "");
STRTEST (NEGATIVE_SIGN, "");
STRTEST (GROUPING, "");

STRTEST (YESSTR, "");
STRTEST (NOSTR, "");

return result;
}

Expand Down
21 changes: 15 additions & 6 deletions posix/tst-chmod.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,11 @@ do_test (int argc, char *argv[])
fd = creat (testfile, 0);
if (fd != -1)
{
puts ("managed to create test file in protected directory");
result = 1;
if (getuid () != 0)
{
puts ("managed to create test file in protected directory");
result = 1;
}
close (fd);
}
if (errno != EACCES)
Expand All @@ -167,8 +170,11 @@ do_test (int argc, char *argv[])
fd = creat (testfile, 0);
if (fd != -1)
{
puts ("managed to create test file in no-x protected directory");
result = 1;
if (getuid () != 0)
{
puts ("managed to create test file in no-x protected directory");
result = 1;
}
close (fd);
}
if (errno != EACCES)
Expand Down Expand Up @@ -311,8 +317,11 @@ do_test (int argc, char *argv[])
snprintf (buf, buflen, "./%s/file", basename (testdir));
if (chmod (buf, 0600) == 0)
{
puts ("chmod(\".../file\") with no-exec directory succeeded");
result = 1;
if (getuid () != 0)
{
puts ("chmod(\".../file\") with no-exec directory succeeded");
result = 1;
}
}
else if (errno != EACCES)
{
Expand Down

0 comments on commit 5836344

Please sign in to comment.