Changeset 2176 for trunk


Ignore:
Timestamp:
Jul 3, 2005, 5:48:26 AM (20 years ago)
Author:
bird
Message:

..

Location:
trunk/src/libctests/glibc
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libctests/glibc/Makefile

    • Property cvs2svn:cvs-rev changed from 1.13 to 1.14
    r2175 r2176  
    99#
    1010OUTDIR = ./out
     11ABSOUTDIR = $(CURDIR)/out
    1112TS     = $(shell date '+"%Y-%m-%d-%H-%M-%S"')
    1213LOG    = $(OUTDIR)/$(1)-$(TS).log
    … …  
    4748        -DHAVE_64BIT_FILEIO_TYPES \
    4849        -DHAVE_SWPRINTF \
    49         -DHAVE_RPC_NETDB_H
     50        -DHAVE_RPC_NETDB_H \
     51        -DHAVE_NL_LANGINFO_EXTENTIONS
    5052endif
    5153
    5254ifeq ($(TARGET),innoteklibc)
    5355SKIPPED    := \
     56        io/test-stat.c \
     57        io/test-stat2.c \
     58        \
     59        login/tst-grantpt.c \
     60        login/tst-utmpx.c \
     61        \
    5462        malloc/tst-mallocstate.c \
    5563        \
    … …  
    153161        posix/tst-pcre.c \
    154162        misc/tst-tsearch.c  \
    155         misc/tst-dirname.c
     163        misc/tst-dirname.c \
     164        io/bug-ftw4.c
    156165       
    157166# NOTES:       
    … …  
    164173# posix/tst-fnmatch.c:                          This too!
    165174# misc/tst-tsearch.c:                           This really needs looking at on BSD.
     175# io/bug-ftw4.c:                                        open("dir")
    166176       
    167177CFLAGS     += -Zomf -g -I sysdeps/os2 \
    … …  
    313323        io/tst-statvfs.c
    314324# todo io/ftwtest.sh
     325io/bug-ftw2.c_DIR = ./io
    315326
    316327LIBIO := \
    … …  
    761772define def_simple
    762773
     774$(eval _EXEC := $(strip $(if $($1_DIR),\
     775        cd $($(1)_DIR) && LC_ALL=C $($1_ENVS) $(ABSOUTDIR)/$(2).exe $($1_ARGS),\
     776        cd $(dir $(OUTDIR)/$2) && LC_ALL=C $($1_ENVS) $(notdir $2).exe $($1_ARGS))))
     777
    763778$(OUTDIR)/$2.result: $1 $(OUTDIR)/$(dir $1).dir_created $($(1)_DEPS)
    764779        @echo "########## $1"; \
    765780        echo  "##  BUILDING: $$(CC) $$(CFLAGS) $$(LDFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<"; \
    766781        if $$(CC) $$(CFLAGS) $$(LDFLAGS) -o $(OUTDIR)/$2.exe $($(1)_CFLAGS) $($(1)_LDFLAGS) $$<; then \
    767                 echo "##  RUNNING : (cd $$(dir $$@) && LC_ALL=C $($1_ENVS) $(notdir $2).exe $($1_ARGS)) $(if $($(1)_INPUT), < $($(1)_INPUT),)"; \
    768                 if (cd $$(dir $$@) && LC_ALL=C $($1_ENVS) $(notdir $2).exe $($1_ARGS)) $(if $($(1)_INPUT), < $($(1)_INPUT),); then\
     782                echo "##  RUNNING : ( $(_EXEC) )$(if $($(1)_INPUT), < $($(1)_INPUT))"; \
     783                if ( $(_EXEC) )$(if $($(1)_INPUT), < $($(1)_INPUT)); then \
    769784                        echo OK > $$@; \
    770785                        printf "########## %-26s - SUCCESS\n" "$1"; \
    … …  
    793808        @printf "########## %-26s - SKIPPED\n" "$1"; \
    794809        echo "SKIPPED" > $$@
    795        
     810
     811$2: $(OUTDIR)/$2.result
     812        @
     813
    796814_TESTS += $(OUTDIR)/$2.result
    797815$(eval _$(TEST) += $(OUTDIR)/$2.result)

  • trunk/src/libctests/glibc/io/bug-ftw4.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r2175 r2176  
    2626#include <sys/stat.h>
    2727#include <unistd.h>
     28
     29#ifndef HAVE_64BIT_FILEIO_TYPES
     30#define ftw64 ftw
     31#define stat64 stat
     32#endif
    2833
    2934static int cb_called;

  • trunk/src/libctests/glibc/io/ftwtest.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r2175 r2176  
    77#include <unistd.h>
    88#include <sys/stat.h>
     9#ifdef FTW_CONTINUE
     10#define FTW_CONTINUE 0
     11#endif
     12#ifdef FTW_STOP
     13#define FTW_STOP 1
     14#endif
     15
    916
    1017
    … …  
    5562  printf (", level = %d\n", f->level);
    5663
     64#ifdef FTW_ACTIONRETVAL
    5765  if (skip_siblings && strcmp (name + f->base, skip_siblings) == 0)
    5866    return FTW_SKIP_SIBLINGS;
    … …  
    6068  if (skip_subtree && strcmp (name + f->base, skip_subtree) == 0)
    6169    return FTW_SKIP_SUBTREE;
     70#endif
    6271
    6372  return do_exit ? 26 : FTW_CONTINUE;
    … …  
    8897  if (skip_subtree || skip_siblings)
    8998    {
     99#ifdef FTW_ACTIONRETVAL
    90100      flag |= FTW_ACTIONRETVAL;
     101#endif
    91102      if (do_exit)
    92103        {

  • trunk/src/libctests/glibc/io/test-lfs.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r2175 r2176  
    2727#include <errno.h>
    2828#include <sys/resource.h>
     29#ifndef HAVE_64BIT_FILEIO_TYPES
     30#define getrlimit64     getrlimit
     31#define setrlimit64     setrlimit
     32#define mkstemp64       mkstemp
     33#define fopen64         fopen
     34#define fstat64         fstat
     35#define stat64          stat
     36#define fseeko64        fseeko
     37#define ftello64        ftello
     38#define lseek64         lseek
     39#define rlimit64        rlimit
     40#define off64_t         off_t
     41#endif
     42
    2943
    3044/* Prototype for our test function.  */

  • trunk/src/libctests/glibc/io/test-utime.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r2175 r2176  
    5151  /* Test utime with arg */
    5252  ut.actime = 500000000;
    53   ut.modtime = 500000001;
     53  ut.modtime = 500000002; /* OS/2 have a two-second resolution api */
    5454  if (utime (file, &ut))
    5555    {

  • trunk/src/libctests/glibc/io/tst-fcntl.c

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r2175 r2176  
    2525#include <unistd.h>
    2626#include <sys/stat.h>
    27 
     27#ifndef HAVE_64BIT_FILEIO_TYPES
     28#define stat64 stat
     29#define fstat64 fstat
     30#endif
    2831
    2932/* Prototype for our test function.  */
Note: See TracChangeset for help on using the changeset viewer.