Menu
▾
▴
[libcw-cvs] [CVS] Module src
|
From: Carlo W. <li...@us...> - 2002-01-11 03:52:12
|
CVSROOT : /cvsroot/libcw
Module : src
Commit time: 2002-00-11 03:52:10 UTC
Modified files:
libcwd/testsuite/.cvsignore libcwd/testsuite/Makefile.in
Added files:
libcwd/testsuite/libcwd.nodebug/nodebug.exp
libcwd/testsuite/libcwd.threads/threads.exp
libcwd/testsuite/libcwd.tst/tst.exp
Removed files:
libcwd/testsuite/libcwd.nodebug/test.exp
libcwd/testsuite/libcwd.threads/test.exp
libcwd/testsuite/libcwd.tst/test.exp
Log message:
Don't run the threads tests when no configured with --enable-libcwd-threading
---------------------- diff included ----------------------
Index: src/libcwd/testsuite/.cvsignore
diff -u src/libcwd/testsuite/.cvsignore:1.5 src/libcwd/testsuite/.cvsignore:1.6
--- src/libcwd/testsuite/.cvsignore:1.5 Tue Jan 8 10:14:38 2002
+++ src/libcwd/testsuite/.cvsignore Thu Jan 10 19:52:00 2002
@@ -1,5 +1,5 @@
-libcwd.log
-libcwd.sum
+*.log
+*.sum
site.exp
Makefile
nodebug_*_shared
Index: src/libcwd/testsuite/Makefile.in
diff -u src/libcwd/testsuite/Makefile.in:1.26 src/libcwd/testsuite/Makefile.in:1.27
--- src/libcwd/testsuite/Makefile.in:1.26 Tue Jan 8 10:14:38 2002
+++ src/libcwd/testsuite/Makefile.in Thu Jan 10 19:52:00 2002
@@ -22,6 +22,7 @@
STATICLIBS = $(top_builddir)/.libs/libcwd.a @LIBS@ @LIB_THREADS@
enable_shared = @enable_shared@
enable_static = @enable_static@
+enable_threads = @libcwd_config_threading@
INCLUDES = -Ilibcwd.tst -I$(top_builddir)/include -I$(srcdir)/../include
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -46,6 +47,13 @@
STATICNODEBUGTARGETS :=
STATICTHREADSTARGETS :=
endif
+ifeq ($(enable_threads), yes)
+SHAREDTARGETS := $(SHAREDTSTTARGETS) $(SHAREDNODEBUGTARGETS) $(SHAREDTHREADSTARGETS)
+EXPECT_SCRIPTS = nodebug.exp threads.exp tst.exp
+else
+SHAREDTARGETS := $(SHAREDTSTTARGETS) $(SHAREDNODEBUGTARGETS)
+EXPECT_SCRIPTS = nodebug.exp tst.exp
+endif
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS)
@@ -79,7 +87,7 @@
-@rm -f ./tmp?
check: site.exp module.so
- $(RUNTEST) $(RUNTESTFLAGS) $(FLAGS_TO_PASS)
+ $(RUNTEST) $(RUNTESTFLAGS) $(FLAGS_TO_PASS) $(EXPECT_SCRIPTS)
module.so: module.cc $(top_builddir)/.libs/libcwd.so.*
$(CXXCOMPILE) -shared -fpic -DPIC -w $< -o $@
@@ -104,21 +112,20 @@
$(CXXLINK) $< -o $@ $(STATICLIBS)
endif
-shared: $(SHAREDTSTTARGETS) $(SHAREDNODEBUGTARGETS) $(SHAREDTHREADSTARGETS)
-static: $(STATICTSTTARGETS) $(STATICNODEBUGTARGETS) $(STATICTHREADSTARGETS)
+shared: $(SHAREDTARGETS)
+static: $(STATICTARGETS)
run: shared static module.so
- @for i in $(SHAREDTSTTARGETS) $(SHAREDNODEBUGTARGETS) $(SHAREDTHREADSTARGETS) \
- $(STATICTSTTARGETS) $(STATICNODEBUGTARGETS) $(STATICTHREADSTARGETS); do \
+ @for i in $(SHAREDTARGETS) $(STATICTARGETS); do \
echo -n "$$i: "; if ./$$i 2>/dev/null >/dev/null; then echo "OK"; else echo "ERROR"; fi ; done
# Clean rules
mostlyclean:
rm -f site.bak core *.core *.o
clean: mostlyclean
- rm -f site.exp libcwd.log libcwd.sum *_*_shared *_*_static module.so .\#* */.\#*
+ rm -f site.exp *.log *.sum *_*_shared *_*_static module.so .\#* */.\#*
distclean: clean
- rm -f Makefile *.log *.sum
+ rm -f Makefile
# Uninstall rule
uninstall:
Index: src/libcwd/testsuite/libcwd.nodebug/nodebug.exp
diff -u /dev/null src/libcwd/testsuite/libcwd.nodebug/nodebug.exp:1.1
--- /dev/null Thu Jan 10 19:52:10 2002
+++ src/libcwd/testsuite/libcwd.nodebug/nodebug.exp Thu Jan 10 19:52:00 2002
@@ -0,0 +1,36 @@
+global srcdir subdir
+global SHAREDLIBS STATICLIBS
+
+catch "glob -nocomplain $srcdir/$subdir/*.cc" srcfiles
+#set srcfiles $srcdir/$subdir/type_info.cc
+verbose "srcfiles are $srcfiles"
+
+set prefix ""
+foreach x $srcfiles {
+ regsub "\\.cc$" $x "" prefix
+ set bname [file tail $prefix]
+ set args ""
+ if [file exists ${prefix}.arg] {
+ set id [open "${prefix}.arg" r];
+ set args [read -nonewline $id];
+ close $id;
+ }
+ set resfile "${prefix}.re"
+ set options "regexp_match nodebug"
+
+ if [file exists ${prefix}.inp] {
+ set inpfile ${prefix}.inp
+ } else {
+ set inpfile ""
+ }
+ verbose "inpfile is $inpfile"
+ verbose "SHAREDLIBS is \"$SHAREDLIBS\""
+ verbose "STATICLIBS is \"$STATICLIBS\""
+
+ if { $SHAREDLIBS != "" } {
+ test_libcwd $options "${prefix}.cc" "" $inpfile $resfile $args
+ }
+ if { $STATICLIBS != "" } {
+ test_libcwd "static $options" "${prefix}.cc" "" $inpfile $resfile $args
+ }
+}
Index: src/libcwd/testsuite/libcwd.nodebug/test.exp
diff -u src/libcwd/testsuite/libcwd.nodebug/test.exp:1.2 src/libcwd/testsuite/libcwd.nodebug/test.exp:removed
--- src/libcwd/testsuite/libcwd.nodebug/test.exp:1.2 Thu Oct 12 14:02:56 2000
+++ src/libcwd/testsuite/libcwd.nodebug/test.exp Thu Jan 10 19:52:10 2002
@@ -1,36 +0,0 @@
-global srcdir subdir
-global SHAREDLIBS STATICLIBS
-
-catch "glob -nocomplain $srcdir/$subdir/*.cc" srcfiles
-#set srcfiles $srcdir/$subdir/type_info.cc
-verbose "srcfiles are $srcfiles"
-
-set prefix ""
-foreach x $srcfiles {
- regsub "\\.cc$" $x "" prefix
- set bname [file tail $prefix]
- set args ""
- if [file exists ${prefix}.arg] {
- set id [open "${prefix}.arg" r];
- set args [read -nonewline $id];
- close $id;
- }
- set resfile "${prefix}.re"
- set options "regexp_match nodebug"
-
- if [file exists ${prefix}.inp] {
- set inpfile ${prefix}.inp
- } else {
- set inpfile ""
- }
- verbose "inpfile is $inpfile"
- verbose "SHAREDLIBS is \"$SHAREDLIBS\""
- verbose "STATICLIBS is \"$STATICLIBS\""
-
- if { $SHAREDLIBS != "" } {
- test_libcwd $options "${prefix}.cc" "" $inpfile $resfile $args
- }
- if { $STATICLIBS != "" } {
- test_libcwd "static $options" "${prefix}.cc" "" $inpfile $resfile $args
- }
-}
Index: src/libcwd/testsuite/libcwd.threads/test.exp
diff -u src/libcwd/testsuite/libcwd.threads/test.exp:1.1 src/libcwd/testsuite/libcwd.threads/test.exp:removed
--- src/libcwd/testsuite/libcwd.threads/test.exp:1.1 Tue Jan 8 10:14:39 2002
+++ src/libcwd/testsuite/libcwd.threads/test.exp Thu Jan 10 19:52:10 2002
@@ -1,34 +0,0 @@
-global srcdir subdir
-global SHAREDLIBS STATICLIBS
-
-catch "glob -nocomplain $srcdir/$subdir/*.cc" srcfiles
-# set srcfiles $srcdir/$subdir/keys.cc
-verbose "srcfiles are $srcfiles"
-
-set prefix ""
-foreach x $srcfiles {
- regsub "\\.cc$" $x "" prefix
- set bname [file tail $prefix]
- set args ""
- if [file exists ${prefix}.arg] {
- set id [open "${prefix}.arg" r];
- set args [read -nonewline $id];
- close $id;
- }
- set resfile "${prefix}.re"
- set options "regexp_match"
-
- if [file exists ${prefix}.inp] {
- set inpfile ${prefix}.inp
- } else {
- set inpfile ""
- }
- verbose "inpfile is $inpfile"
-
- if { $SHAREDLIBS != "" } {
- test_libcwd $options "${prefix}.cc" "" $inpfile $resfile $args
- }
- if { $STATICLIBS != "" } {
- test_libcwd "static $options" "${prefix}.cc" "" $inpfile $resfile $args
- }
-}
Index: src/libcwd/testsuite/libcwd.threads/threads.exp
diff -u /dev/null src/libcwd/testsuite/libcwd.threads/threads.exp:1.1
--- /dev/null Thu Jan 10 19:52:10 2002
+++ src/libcwd/testsuite/libcwd.threads/threads.exp Thu Jan 10 19:52:00 2002
@@ -0,0 +1,34 @@
+global srcdir subdir
+global SHAREDLIBS STATICLIBS
+
+catch "glob -nocomplain $srcdir/$subdir/*.cc" srcfiles
+# set srcfiles $srcdir/$subdir/keys.cc
+verbose "srcfiles are $srcfiles"
+
+set prefix ""
+foreach x $srcfiles {
+ regsub "\\.cc$" $x "" prefix
+ set bname [file tail $prefix]
+ set args ""
+ if [file exists ${prefix}.arg] {
+ set id [open "${prefix}.arg" r];
+ set args [read -nonewline $id];
+ close $id;
+ }
+ set resfile "${prefix}.re"
+ set options "regexp_match"
+
+ if [file exists ${prefix}.inp] {
+ set inpfile ${prefix}.inp
+ } else {
+ set inpfile ""
+ }
+ verbose "inpfile is $inpfile"
+
+ if { $SHAREDLIBS != "" } {
+ test_libcwd $options "${prefix}.cc" "" $inpfile $resfile $args
+ }
+ if { $STATICLIBS != "" } {
+ test_libcwd "static $options" "${prefix}.cc" "" $inpfile $resfile $args
+ }
+}
Index: src/libcwd/testsuite/libcwd.tst/test.exp
diff -u src/libcwd/testsuite/libcwd.tst/test.exp:1.8 src/libcwd/testsuite/libcwd.tst/test.exp:removed
--- src/libcwd/testsuite/libcwd.tst/test.exp:1.8 Thu Jan 3 20:22:33 2002
+++ src/libcwd/testsuite/libcwd.tst/test.exp Thu Jan 10 19:52:10 2002
@@ -1,34 +0,0 @@
-global srcdir subdir
-global SHAREDLIBS STATICLIBS
-
-catch "glob -nocomplain $srcdir/$subdir/*.cc" srcfiles
-# set srcfiles $srcdir/$subdir/leak.cc
-verbose "srcfiles are $srcfiles"
-
-set prefix ""
-foreach x $srcfiles {
- regsub "\\.cc$" $x "" prefix
- set bname [file tail $prefix]
- set args ""
- if [file exists ${prefix}.arg] {
- set id [open "${prefix}.arg" r];
- set args [read -nonewline $id];
- close $id;
- }
- set resfile "${prefix}.re"
- set options "regexp_match"
-
- if [file exists ${prefix}.inp] {
- set inpfile ${prefix}.inp
- } else {
- set inpfile ""
- }
- verbose "inpfile is $inpfile"
-
- if { $SHAREDLIBS != "" } {
- test_libcwd $options "${prefix}.cc" "" $inpfile $resfile $args
- }
- if { $STATICLIBS != "" } {
- test_libcwd "static $options" "${prefix}.cc" "" $inpfile $resfile $args
- }
-}
Index: src/libcwd/testsuite/libcwd.tst/tst.exp
diff -u /dev/null src/libcwd/testsuite/libcwd.tst/tst.exp:1.1
--- /dev/null Thu Jan 10 19:52:10 2002
+++ src/libcwd/testsuite/libcwd.tst/tst.exp Thu Jan 10 19:52:00 2002
@@ -0,0 +1,34 @@
+global srcdir subdir
+global SHAREDLIBS STATICLIBS
+
+catch "glob -nocomplain $srcdir/$subdir/*.cc" srcfiles
+# set srcfiles $srcdir/$subdir/leak.cc
+verbose "srcfiles are $srcfiles"
+
+set prefix ""
+foreach x $srcfiles {
+ regsub "\\.cc$" $x "" prefix
+ set bname [file tail $prefix]
+ set args ""
+ if [file exists ${prefix}.arg] {
+ set id [open "${prefix}.arg" r];
+ set args [read -nonewline $id];
+ close $id;
+ }
+ set resfile "${prefix}.re"
+ set options "regexp_match"
+
+ if [file exists ${prefix}.inp] {
+ set inpfile ${prefix}.inp
+ } else {
+ set inpfile ""
+ }
+ verbose "inpfile is $inpfile"
+
+ if { $SHAREDLIBS != "" } {
+ test_libcwd $options "${prefix}.cc" "" $inpfile $resfile $args
+ }
+ if { $STATICLIBS != "" } {
+ test_libcwd "static $options" "${prefix}.cc" "" $inpfile $resfile $args
+ }
+}
----------------------- End of diff -----------------------
|
