[Libsysio-commit] RedStorm_merge: libsysio .cvsignore run.sh Makefile.am README configure.in
Brought to you by:
lward
From: Ruth K. <rk...@us...> - 2003-09-05 16:36:30
|
Update of /cvsroot/libsysio/libsysio In directory sc8-pr-cvs1:/tmp/cvs-serv8570 Modified Files: Tag: RedStorm_merge Makefile.am README configure.in Added Files: Tag: RedStorm_merge .cvsignore run.sh Log Message: merge changes from Mike Levenhagen --- NEW FILE --- Makefile autom4te.cache linux32 sysioV2.log sysioV2.make.log snos32 config.log config.status snos64 cnos32 cnos64 --- NEW FILE --- #!/bin/bash ############################################################################ # # File: run.sh # # Description: Script to exercise the sysioV2 library. # # Usage: # run.sh # # Limitations: # 1. Doesn't exercise all of sysioV2. # ############################################################################ # defaults - change as necessary for local system TEST_PATH=./tests SCRATCH=scratch.$$ SRC=/tmp/test_copy.src.$$ DEST=/tmp/test_copy.dest.$$ NEWDIR=/tmp/newdir.$$ PASSCNT=0 #This is the anticipated count of passes # main processing logic follows cp /dev/null $SCRATCH rm -f $SRC $DEST if [ -f $SRC ] then echo "Could not remove $SRC - test INDETERMINATE" >> $SCRATCH exit 5 fi if [ -f $DEST ] then echo "Could not remove $DEST - test INDETERMINATE" >> $SCRATCH exit 5 fi if ( ! cp /usr/include/stdio.h $SRC ) # just picked something handy then echo "Could not create source file - test INDETERMINATE" >> $SCRATCH exit 5 fi # # Run the copy test # PASSCNT=`expr $PASSCNT + 1` echo "++++Running test_copy" >> $SCRATCH ${TEST_PATH}/test_copy ${SRC} ${DEST} SRC_VERF=`cksum $SRC | awk '{ print $1 }'` DEST_VERF=`cksum $DEST | awk '{ print $1 }'` if [ -z $DEST_VERF ] then echo "Copy failed; test_copy FAILED" >> $SCRATCH elif [ "$SRC_VERF" -ne "$DEST_VERF" ] then echo "The source and destination files did not match; test_copy FAILED" >> $SCRATCH 2>&1 else echo "The source and destination files matched $SRC_VERF; test_copy PASSED" >> $SCRATCH 2>&1 fi # # Run the list test # PASSCNT=`expr $PASSCNT + 1` echo " " >> $SCRATCH echo "++++Running test_list" >> $SCRATCH ${TEST_PATH}/test_list /tmp >> $SCRATCH 2>&1 if ( grep `basename $SRC` $SCRATCH > /dev/null ) && ( grep `basename $DEST` $SCRATCH > /dev/null ) then echo "The list found newly created files; test_list PASSED" >> $SCRATCH else echo "File list did not find expected files; test_list FAILED" >> $SCRATCH fi # # Run the test_stats # PASSCNT=`expr $PASSCNT + 1` echo " " >> $SCRATCH echo "++++Running test_stats" >> $SCRATCH ${TEST_PATH}/test_stats $SRC >> $SCRATCH if ( grep ${SRC}: $SCRATCH | grep ino > /dev/null ) then echo "The stat succeeeded; test_stats PASSED" >> $SCRATCH else echo "Unexpected stat result; test_stats FAILED" >> $SCRATCH fi # # Run the test_cwd # PASSCNT=`expr $PASSCNT + 1` echo " " >> $SCRATCH echo "++++Running test_getcwd" >> $SCRATCH mkdir $NEWDIR ${TEST_PATH}/test_getcwd $NEWDIR >> $SCRATCH 2>/dev/null if ( grep $NEWDIR $SCRATCH > /dev/null ) then echo "Chdir and getcwd gave expected result; test_getcwd PASSED" >> $SCRATCH else echo "Unexpected output from chdir and getcwd; test_getcwd FAILED" >> $SCRATCH fi # # Run the test_path # PASSCNT=`expr $PASSCNT + 1` echo " " >> $SCRATCH echo "++++Running test_path" >> $SCRATCH ${TEST_PATH}/test_path $NEWDIR $SRC >> $SCRATCH 2>&1 if ( grep "$NEWDIR: d" $SCRATCH > /dev/null ) && ( grep "$SRC: f" $SCRATCH > /dev/null ) then echo "Found expected results; test_path PASSED" >> $SCRATCH else echo "Unexpected results; test_path FAILED" >> $SCRATCH fi # # Report test results # echo "" if grep "FAILED" $SCRATCH > /dev/null then cat $SCRATCH echo "TEST $0 FAILED - found failed" RC=8 elif test `grep -c "PASSED" $SCRATCH` -ne $PASSCNT > /dev/null then cat $SCRATCH echo "TEST $0 FAILED - wrong pass count" RC=4 else echo "TEST $0 PASSED" RC=0 fi #Cleanup rm -f $SRC $DEST rmdir $NEWDIR exit $RC Index: Makefile.am =================================================================== RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v retrieving revision 1.7 retrieving revision 1.7.10.1 diff -u -w -b -B -p -r1.7 -r1.7.10.1 --- Makefile.am 26 Mar 2003 00:00:15 -0000 1.7 +++ Makefile.am 5 Sep 2003 16:36:16 -0000 1.7.10.1 @@ -15,7 +15,9 @@ really-clean: maintainer-clean -rm -rf autom4te-2.53.cache -rm -rf .deps -rm -f Makefile.in \ - drivers/native/Makefile.in drivers/incore/Makefile.in \ + drivers/native/Makefile.in \ + drivers/incore/Makefile.in \ + drivers/redstorm/Makefile.in \ drivers/Makefile.in \ dev/stdfd/Makefile.in \ dev/Makefile.in \ Index: README =================================================================== RCS file: /cvsroot/libsysio/libsysio/README,v retrieving revision 1.2.12.2 retrieving revision 1.2.12.2.2.1 diff -u -w -b -B -p -r1.2.12.2 -r1.2.12.2.2.1 --- README 27 May 2003 13:44:30 -0000 1.2.12.2 +++ README 5 Sep 2003 16:36:16 -0000 1.2.12.2.2.1 @@ -63,4 +63,8 @@ The following works for me: export CFLAGS="-DREDSTORM -nostdinc -isystem /home/lee/REDSTORM/catamount/computeincs/i386 -isystem /home/lee/REDSTORM/catamount/include -g -W -Wall -ansi" -sh configure --with-autmount=".mount" --with-native=yes --with-incore-yes --with-stdfd=yes --with-tests=yes +# No tests until the compute libraries include support for getopt! +sh configure --with-autmount=".mount" --with-native=yes --with-incore-yes --with-stdfd=yes --with-tests=no + +Support for getopt is supposed to be coming soon. The tests can be reenabled +when that happens, I hope. Index: configure.in =================================================================== RCS file: /cvsroot/libsysio/libsysio/configure.in,v retrieving revision 1.5.6.4 retrieving revision 1.5.6.4.2.1 diff -u -w -b -B -p -r1.5.6.4 -r1.5.6.4.2.1 --- configure.in 29 Jul 2003 20:17:22 -0000 1.5.6.4 +++ configure.in 5 Sep 2003 16:36:16 -0000 1.5.6.4.2.1 @@ -19,6 +19,20 @@ AC_HEADER_STDC AC_HEADER_STAT AC_HEADER_TIME +AC_ARG_WITH(redstorm_driver, + [ --with-redstorm-driver build redstorm driver], + [ case "${withval}" in + yes) if test x${with_stdfd_dev} != xyes; then + with_stdfd_dev=yes + AM_CONDITIONAL(WITH_STDFD_DEV, test x$with_stdfd_dev = +xyes) + fi ;; + no) ;; + *) AC_MSG_ERROR(bad value ${withval} for --with-redstorm-driver);; + esac], + [with_redstorm_driver=no]) +AM_CONDITIONAL(WITH_REDSTORM_DRIVER, test x$with_redstorm_driver = xyes) + AC_ARG_WITH(native_driver, [ --with-native-driver build native test driver], [ with_native_driver=${withval} @@ -213,19 +227,6 @@ AC_MSG_RESULT($have__st_ino) if test x$have__st_ino = xyes; then AC_DEFINE(HAVE__ST_INO) fi -# Check for st_gen -# -AC_MSG_CHECKING(for st_gen) -AC_TRY_COMPILE([ -#include <sys/stat.h>], -[struct stat st; -st.st_gen = 0;], - have_st_gen=yes, - have_st_gen=no) -AC_MSG_RESULT($have_st_gen) -if test x$have_st_gen = xyes; then - AC_DEFINE(HAVE_GENERATION) -fi # Check for getdents64 call # @@ -348,6 +349,7 @@ AC_OUTPUT( Makefile src/Makefile drivers/Makefile + drivers/redstorm/Makefile drivers/native/Makefile drivers/incore/Makefile dev/Makefile |