summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitar Misev <d.misev@jacobs-university.de>2011-02-11 10:33:35 +0000
committerwww-data <www-data@ubuntu.localdomain>2011-02-16 10:01:18 +0100
commit054f18a0e07c429609aae393f6bde67f21f9b82c (patch)
tree225352b98851647a91c6a91297194452bee92601
parent93445fe29563387538a4529d61922d8b814d240f (diff)
downloadrasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.zip
rasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.tar.gz
rasdaman-upstream-054f18a0e07c429609aae393f6bde67f21f9b82c.tar.xz
systemtest fixes
-rw-r--r--systemtest/Makefile104
-rw-r--r--systemtest/Makefile.in50
-rwxr-xr-xsystemtest/testcases_mandatory/test_conversion/test.sh12
-rwxr-xr-xsystemtest/testcases_mandatory/test_manipulation/test.sh10
-rwxr-xr-xsystemtest/testcases_mandatory/test_select/test.sh14
-rw-r--r--systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql2
-rwxr-xr-xsystemtest/testcases_open/test_select/test.sh10
7 files changed, 125 insertions, 77 deletions
diff --git a/systemtest/Makefile b/systemtest/Makefile
index 895cbb4..1d9e1c4 100644
--- a/systemtest/Makefile
+++ b/systemtest/Makefile
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# systemtest/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -49,8 +50,9 @@
# all test programs
pkgdatadir = $(datadir)/rasdaman
-pkglibdir = $(libdir)/rasdaman
pkgincludedir = $(includedir)/rasdaman
+pkglibdir = $(libdir)/rasdaman
+pkglibexecdir = $(libexecdir)/rasdaman
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -76,18 +78,19 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/missing --run aclocal-1.10
+ACLOCAL = ${SHELL} /home/dimitar/projects/rasdaman/rasdaman/missing --run aclocal-1.11
ALLOCA =
-AMTAR = ${SHELL} /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/missing --run tar
-AUTOCONF = ${SHELL} /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/missing --run automake-1.10
+AMTAR = ${SHELL} /home/dimitar/projects/rasdaman/rasdaman/missing --run tar
+AUTOCONF = ${SHELL} /home/dimitar/projects/rasdaman/rasdaman/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dimitar/projects/rasdaman/rasdaman/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dimitar/projects/rasdaman/rasdaman/missing --run automake-1.11
AWK = gawk
-BASEDBCXXFLAGS = -I/usr/local/pgsql/include
-BASEDBLDFLAGS = -L/usr/local/pgsql/lib -lpq -lz -lecpg -lnsl
+BASEDBCXXFLAGS = -I/usr/include/postgresql
+BASEDBLDFLAGS = -L/usr/lib -lpq -lz -lecpg -lnsl
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
@@ -97,22 +100,22 @@ CPP = gcc -E
CPPFLAGS =
CXX = g++
CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -O2 -I/home/rasdaman/Desktop/tmp/rasdaman/ras20100804 -I/home/rasdaman/Desktop/tmp/rasdaman/ras20100804/debug -I/home/rasdaman/Desktop/tmp/rasdaman/ras20100804/include -DSHARE_DATA_DIR=\"$(pkgdatadir)/\" -DCONFDIR=\"$(sysconfdir)/\" -DBINDIR=\"$(bindir)/\" -DABSOLUTE_LOG_DIR=\"$(logdir)/\"
+CXXFLAGS = -O2 -I/home/dimitar/projects/rasdaman/rasdaman -I/home/dimitar/projects/rasdaman/rasdaman/debug -I/home/dimitar/projects/rasdaman/rasdaman/include -DSHARE_DATA_DIR=\"$(pkgdatadir)/\" -DCONFDIR=\"$(sysconfdir)/\" -DBINDIR=\"$(bindir)/\" -DLOGDIR=\"$(logdir)/\"
CYGPATH_W = echo
DB2_CPPLIBS =
DB2_INC =
DB2_INSTANCEPATH =
DBIF_INC =
-DEFS = -DPACKAGE_NAME=\"Rasdaman\" -DPACKAGE_TARNAME=\"rasdaman\" -DPACKAGE_VERSION=\"8.0.0\" -DPACKAGE_STRING=\"Rasdaman\ 8.0.0\" -DPACKAGE_BUGREPORT=\"baumann@rasdaman.com\" -DPACKAGE=\"rasdaman\" -DVERSION=\"8.0.0\" -DYYTEXT_POINTER=1 -DHAVE_LIBCRYPT=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBDF=1 -DHAVE_LIBDL=1 -DHAVE_LIBFL=1 -DHAVE_LIBJPEG=1 -DHAVE_LIBM=1 -DHAVE_LIBMFHDF=1 -DHAVE_LIBNCURSES=1 -DHAVE_LIBPNG=1 -DHAVE_LIBNETPBM=1 -DHAVE_LIBREADLINE=1 -DHAVE_LIBSTORAGEMGR=1 -DHAVE_LIBTIFF=1 -DHAVE_LIBZ=1 -DHAVE_DIRENT_H=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_FCNTL_H=1 -DHAVE_FLOAT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_MALLOC_H=1 -DHAVE_MEMORY_H=1 -DHAVE_NETDB_H=1 -DHAVE_NETINET_IN_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_VALUES_H=1 -DHAVE_HDF_HDF_H=1 -DHAVE_HDF_MFHDF_H=1 -DHAVE__BOOL=1 -DHAVE_STDBOOL_H=1 -Drestrict=__restrict -DTIME_WITH_SYS_TIME=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_MBSTATE_T=1 -DHAVE_FORK=1 -DHAVE_VFORK=1 -DHAVE_WORKING_VFORK=1 -DHAVE_WORKING_FORK=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ALARM=1 -DHAVE_STDLIB_H=1 -DHAVE_REALLOC=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKET_H=1 -DSELECT_TYPE_ARG1=int -DSELECT_TYPE_ARG234=\(fd_set\ \*\) -DSELECT_TYPE_ARG5=\(struct\ timeval\ \*\) -DRETSIGTYPE=void -DLSTAT_FOLLOWS_SLASHED_SYMLINK=1 -DHAVE_STRFTIME=1 -DHAVE_VPRINTF=1 -DHAVE_ALARM=1 -DHAVE_BZERO=1 -DHAVE_DUP2=1 -DHAVE_FLOOR=1 -DHAVE_GETCWD=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_GETHOSTBYNAME=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETPASS=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_INET_NTOA=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MEMMOVE=1 -DHAVE_MEMSET=1 -DHAVE_MKDIR=1 -DHAVE_PATHCONF=1 -DHAVE_POW=1 -DHAVE_RINT=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1 -DHAVE_SQRT=1 -DHAVE_STRCASECMP=1 -DHAVE_STRCHR=1 -DHAVE_STRDUP=1 -DHAVE_STRERROR=1 -DHAVE_STRNCASECMP=1 -DHAVE_STRRCHR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOUL=1 -DHAVE_POSTGRESQL=1 -DBASEDB_PGSQL=1 -DHAVE_LIBPQ=1 -DHAVE_LIBPGTYPES=1 -D__NO_MATH_INLINES=1 -DRMANVERSION=8000 -DBASEDBSTRING=\"pgsql\" -DEARLY_TEMPLATE=1 -DLITTLE_ENDIAN=1 -DCPPSTDLIB=1 -DX86=1 -DRASARCHITECTURE=\"X86\" -DRASSCHEMAVERSION=5 -DNOPRE=1 -DNO_in_addr_t=1 -DCOMPDATE=\"17.10.2010\ 21:43:09\"
+DEFS = -DPACKAGE_NAME=\"Rasdaman\" -DPACKAGE_TARNAME=\"rasdaman\" -DPACKAGE_VERSION=\"8.0.0\" -DPACKAGE_STRING=\"Rasdaman\ 8.0.0\" -DPACKAGE_BUGREPORT=\"baumann@rasdaman.com\" -DPACKAGE_URL=\"\" -DPACKAGE=\"rasdaman\" -DVERSION=\"8.0.0\" -DYYTEXT_POINTER=1 -DHAVE_LIBCRYPT=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBDFALT=1 -DHAVE_LIBDL=1 -DHAVE_LIBFL=1 -DHAVE_LIBJPEG=1 -DHAVE_LIBM=1 -DHAVE_LIBMFHDFALT=1 -DHAVE_LIBNCURSES=1 -DHAVE_LIBPNG=1 -DHAVE_LIBNETPBM=1 -DHAVE_LIBREADLINE=1 -DHAVE_LIBTIFF=1 -DHAVE_LIBZ=1 -DHAVE_DIRENT_H=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ARPA_INET_H=1 -DHAVE_FCNTL_H=1 -DHAVE_FLOAT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_MALLOC_H=1 -DHAVE_MEMORY_H=1 -DHAVE_NETDB_H=1 -DHAVE_NETINET_IN_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_VALUES_H=1 -DHAVE_HDF_HDF_H=1 -DHAVE_HDF_MFHDF_H=1 -DHAVE__BOOL=1 -DHAVE_STDBOOL_H=1 -Drestrict=__restrict -DTIME_WITH_SYS_TIME=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_MBSTATE_T=1 -DHAVE_FORK=1 -DHAVE_VFORK=1 -DHAVE_WORKING_VFORK=1 -DHAVE_WORKING_FORK=1 -DHAVE_STDLIB_H=1 -DHAVE_MALLOC=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ALARM=1 -DHAVE_STDLIB_H=1 -DHAVE_REALLOC=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKET_H=1 -DSELECT_TYPE_ARG1=int -DSELECT_TYPE_ARG234=\(fd_set\ \*\) -DSELECT_TYPE_ARG5=\(struct\ timeval\ \*\) -DRETSIGTYPE=void -DLSTAT_FOLLOWS_SLASHED_SYMLINK=1 -DHAVE_STRFTIME=1 -DHAVE_VPRINTF=1 -DHAVE_ALARM=1 -DHAVE_BZERO=1 -DHAVE_DUP2=1 -DHAVE_FLOOR=1 -DHAVE_GETCWD=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_GETHOSTBYNAME=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETPASS=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_INET_NTOA=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MEMMOVE=1 -DHAVE_MEMSET=1 -DHAVE_MKDIR=1 -DHAVE_PATHCONF=1 -DHAVE_POW=1 -DHAVE_RINT=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1 -DHAVE_SQRT=1 -DHAVE_STRCASECMP=1 -DHAVE_STRCHR=1 -DHAVE_STRDUP=1 -DHAVE_STRERROR=1 -DHAVE_STRNCASECMP=1 -DHAVE_STRRCHR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOUL=1 -DHAVE_POSTGRESQL=1 -DBASEDB_PGSQL=1 -DHAVE_LIBPQ=1 -DHAVE_LIBPGTYPES=1 -D__NO_MATH_INLINES=1 -DRMANVERSION=8000 -DBASEDBSTRING=\"pgsql\" -DEARLY_TEMPLATE=1 -DLITTLE_ENDIAN=1 -DCPPSTDLIB=1 -DX86=1 -DRASARCHITECTURE=\"X86\" -DRASSCHEMAVERSION=5 -DNOPRE=1 -DNO_in_addr_t=1 -DCOMPDATE=\"07.02.2011\ 15:13:31\"
DEPDIR = .deps
ECHO_C =
ECHO_N = -n
ECHO_T =
-ECPG = /usr/local/pgsql/bin/ecpg
+ECPG = /usr/bin/ecpg
EGREP = /bin/grep -E
EMBEDDEDSQLEXT = pgc
EMBEDDEDSQLOUT = cc
-EMBEDDEDSQLPRECOMPILER = /usr/local/pgsql/bin/ecpg -o
+EMBEDDEDSQLPRECOMPILER = /usr/bin/ecpg -o
EXEEXT =
GCJ_OPTS =
GREP = /bin/grep
@@ -126,15 +129,15 @@ JAR_TOOL = jar
JAVA_CC = javac
JAVA_CC_FLAGS =
JAVA_CC_OPTS =
-LDFLAGS = -L/usr/local/pgsql/lib -lpq
+LDFLAGS = -L/usr/lib -lpq
LEX = flex
LEXLIB = -lfl
LEX_OUTPUT_ROOT = lex.yy
LIBOBJS =
-LIBS = -lpgtypes -lpq -lz -ltiff -lstoragemgr -lreadline -lnetpbm -lpng -lncurses -lmfhdf -lm -ljpeg -lfl -ldl -ldf -lcrypto -lcrypt
+LIBS = -lpgtypes -lpq -lz -ltiff -lreadline -lnetpbm -lpng -lncurses -lmfhdfalt -lm -ljpeg -lfl -ldl -ldfalt -lcrypto -lcrypt
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dimitar/projects/rasdaman/rasdaman/missing --run makeinfo
MKDIR_P = /bin/mkdir -p
OBJEXT = o
ORALDFLAGS =
@@ -146,30 +149,31 @@ PACKAGE_BUGREPORT = baumann@rasdaman.com
PACKAGE_NAME = Rasdaman
PACKAGE_STRING = Rasdaman 8.0.0
PACKAGE_TARNAME = rasdaman
+PACKAGE_URL =
PACKAGE_VERSION = 8.0.0
PATH_SEPARATOR = :
-PG_CONFIG = /usr/local/pgsql/bin/pg_config
-POSTGRESQL_CFLAGS = -I/usr/local/pgsql/include
-POSTGRESQL_LDFLAGS = -L/usr/local/pgsql/lib -lpq
-POSTGRESQL_VERSION = 7.4.22
+PG_CONFIG = /usr/bin/pg_config
+POSTGRESQL_CFLAGS = -I/usr/include/postgresql
+POSTGRESQL_LDFLAGS = -L/usr/lib -lpq
+POSTGRESQL_VERSION = 8.4.5
POW_LIB =
RANLIB = ranlib
RASMGR_PORT = 7001
REL_STATIC_LIBS =
-RMANBASE = /home/rasdaman/Desktop/tmp/rasdaman/ras20100804
+RMANBASE = /home/dimitar/projects/rasdaman/rasdaman
RPCGEN = /usr/bin/rpcgen
SED = /bin/sed
SET_MAKE =
SHELL = /bin/bash
-STATICBASEDBFLAGS = -L/usr/local/pgsql/lib -lpq -lz -lecpg
+STATICBASEDBFLAGS = -L/usr/lib -lpq -lz -lecpg
STRIP =
VERSION = 8.0.0
XMKMF =
YACC = bison
-abs_builddir = /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/systemtest
-abs_srcdir = /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/systemtest
-abs_top_builddir = /home/rasdaman/Desktop/tmp/rasdaman/ras20100804
-abs_top_srcdir = /home/rasdaman/Desktop/tmp/rasdaman/ras20100804
+abs_builddir = /home/dimitar/projects/rasdaman/rasdaman/systemtest
+abs_srcdir = /home/dimitar/projects/rasdaman/rasdaman/systemtest
+abs_top_builddir = /home/dimitar/projects/rasdaman/rasdaman
+abs_top_srcdir = /home/dimitar/projects/rasdaman/rasdaman
ac_ct_CC = gcc
ac_ct_CXX = g++
am__include = include
@@ -189,17 +193,17 @@ host_alias =
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/rasdaman/Desktop/tmp/rasdaman/ras20100804/install-sh
+install_sh = ${SHELL} /home/dimitar/projects/rasdaman/rasdaman/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
-logdir = NONE/log
+logdir = /home/dimitar/projects/rasdaman/install/log
mandir = ${datarootdir}/man
mkdir_p = /bin/mkdir -p
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /usr/local
+prefix = /home/dimitar/projects/rasdaman/install
program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
@@ -207,6 +211,7 @@ sharedstatedir = ${prefix}/com
srcdir = .
sysconfdir = ${prefix}/etc
target_alias =
+top_build_prefix = ../
top_builddir = ..
top_srcdir = ..
@@ -222,14 +227,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemtest/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu systemtest/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemtest/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu systemtest/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -247,6 +252,7 @@ $(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
@@ -270,13 +276,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -304,6 +314,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -320,6 +331,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -328,18 +341,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -390,10 +413,11 @@ check:
clean:
for testcase in ${TESTSEQUENCE}; do \
- PATH=${bindir}:${PATH} rm $${testcase}/log*; \
+ PATH=${bindir}:${PATH} rm -rf $${testcase}/log*; \
done;
######################## Dependencies ############################
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/systemtest/Makefile.in b/systemtest/Makefile.in
index ce036e8..1a9344d 100644
--- a/systemtest/Makefile.in
+++ b/systemtest/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -49,8 +50,9 @@
# all test programs
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
@@ -76,6 +78,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -146,6 +149,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PG_CONFIG = @PG_CONFIG@
@@ -207,6 +211,7 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -222,14 +227,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemtest/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu systemtest/Makefile
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemtest/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu systemtest/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -247,6 +252,7 @@ $(top_srcdir)/configure: $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
@@ -270,13 +276,17 @@ distdir: $(DISTFILES)
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@@ -304,6 +314,7 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -320,6 +331,8 @@ dvi-am:
html: html-am
+html-am:
+
info: info-am
info-am:
@@ -328,18 +341,28 @@ install-data-am:
install-dvi: install-dvi-am
+install-dvi-am:
+
install-exec-am:
install-html: install-html-am
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
install-pdf: install-pdf-am
+install-pdf-am:
+
install-ps: install-ps-am
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -390,10 +413,11 @@ check:
clean:
for testcase in ${TESTSEQUENCE}; do \
- PATH=${bindir}:${PATH} rm $${testcase}/log*; \
+ PATH=${bindir}:${PATH} rm -rf $${testcase}/log*; \
done;
######################## Dependencies ############################
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/systemtest/testcases_mandatory/test_conversion/test.sh b/systemtest/testcases_mandatory/test_conversion/test.sh
index 997c73b..5c165d9 100755
--- a/systemtest/testcases_mandatory/test_conversion/test.sh
+++ b/systemtest/testcases_mandatory/test_conversion/test.sh
@@ -80,11 +80,11 @@ echo "Test by:"$PROGNAME" at "`date`|tee $LOG
#---------------------------Precondition------------------------------------------
# check the Postgres
-ps -e | grep --quiet postmaster
+ps -e | grep --quiet -w postgres
if [ $? -ne 0 ]
then
- echo no postmaster available|tee -a $LOG
- exit $CODE_FAIL
+ echo no postgres available|tee -a $LOG
+ exit $CODE_FAIL
fi
# check the Rasdaman
@@ -391,7 +391,7 @@ rm mr_1.hdf.unknown
if [ $NUM_TOTAL = $NUM_SUC ]
then
- exit $CODE_OK 0
+ exit $CODE_OK
else
- exit $CODE_FAIL 255
- fi \ No newline at end of file
+ exit $CODE_FAIL
+ fi
diff --git a/systemtest/testcases_mandatory/test_manipulation/test.sh b/systemtest/testcases_mandatory/test_manipulation/test.sh
index 63e778a..47d70aa 100755
--- a/systemtest/testcases_mandatory/test_manipulation/test.sh
+++ b/systemtest/testcases_mandatory/test_manipulation/test.sh
@@ -78,11 +78,11 @@ echo "Test by:"$PROGNAME" at "`date`|tee $LOG
#---------------------------Precondition------------------------------------------
# check the Postgres
-ps -e | grep --quiet postmaster
+ps -e | grep --quiet -w postgres
if [ $? -ne 0 ]
then
- echo no postmaster available|tee -a $LOG
- exit $CODE_FAIL
+ echo no postgres available|tee -a $LOG
+ exit $CODE_FAIL
fi
# check the Rasdaman
@@ -186,7 +186,7 @@ NUM_TOTAL=$(($NUM_SUC + $NUM_FAIL))
if [ $NUM_TOTAL = $NUM_SUC ]
then
- exit $CODE_OK 0
+ exit $CODE_OK
else
- exit $CODE_FAIL 255
+ exit $CODE_FAIL
fi
diff --git a/systemtest/testcases_mandatory/test_select/test.sh b/systemtest/testcases_mandatory/test_select/test.sh
index 70dfc1f..3b17ee1 100755
--- a/systemtest/testcases_mandatory/test_select/test.sh
+++ b/systemtest/testcases_mandatory/test_select/test.sh
@@ -83,11 +83,11 @@
echo "Test by:"$PROGNAME $QUERY_DIR $ORACLE_DIR $LOG_DIR" at "`date`|tee $LOG
#---------------------------Precondition------------------------------------------
# check the Postgres
-ps -e | grep --quiet -w postmaster
+ps -e | grep --quiet -w postgres
if [ $? -ne 0 ]
then
- echo no postmaster available|tee -a $LOG
- exit $CODE_FAIL
+ echo no postgres available|tee -a $LOG
+ exit $CODE_FAIL
fi
# check the Rasdaman
@@ -197,7 +197,7 @@ fi
echo creating test collection $TEST_RGB2... | tee -a $LOG
$RASQL -q 'create collection '$TEST_RGB2' RGBSet' --user $USERNAME --passwd $PASSWORD || echo Error creating collection $TEST_RGB2| tee -a $LOG
-if $RASQL -q "select r from RAS_COLLECTIONNAMES as r" --out string|grep -w test_rgb
+if $RASQL -q "select r from RAS_COLLECTIONNAMES as r" --out string|grep -w $TEST_RGB2
then
echo create collection $TEST_RGB2 RGBSet successfully ... | tee -a $LOG
else
@@ -219,7 +219,7 @@ else
fi
fi
#==========================test by queries==================================================
- if [ ! -f $QUERY_DIR/*.rasql ]
+ if [ ! -f "$QUERY_DIR/*.rasql" ]
then
echo "there is no rasql for test in the "$QUERY_DIR
else
@@ -286,7 +286,7 @@ fi
if [ $NUM_TOTAL = $NUM_SUC ]
then
- exit $CODE_OK 0
+ exit $CODE_OK
else
- exit $CODE_FAIL 255
+ exit $CODE_FAIL
fi
diff --git a/systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql b/systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql
index 67d8273..9a0486b 100644
--- a/systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql
+++ b/systemtest/testcases_mandatory/test_select/test_rasql/induced_and_struct.rasql
@@ -1 +1 @@
-select test_rgb + 5 from test_rgb \ No newline at end of file
+select test_rgb2 + 5 from test_rgb2
diff --git a/systemtest/testcases_open/test_select/test.sh b/systemtest/testcases_open/test_select/test.sh
index 0553a25..1b086d2 100755
--- a/systemtest/testcases_open/test_select/test.sh
+++ b/systemtest/testcases_open/test_select/test.sh
@@ -83,10 +83,10 @@
echo "Test by:"$PROGNAME $QUERY_DIR $ORACLE_DIR $LOG_DIR" at "`date`|tee $LOG
#---------------------------Precondition------------------------------------------
# check the Postgres
-ps -e | grep --quiet -w postmaster
+ps -e | grep --quiet -w postgres
if [ $? -ne 0 ]
then
- echo no postmaster available|tee -a $LOG
+ echo no postgres available|tee -a $LOG
exit $CODE_FAIL
fi
@@ -197,7 +197,7 @@ fi
echo creating test collection $TEST_RGB2... | tee -a $LOG
$RASQL -q 'create collection '$TEST_RGB2' RGBSet' --user $USERNAME --passwd $PASSWORD || echo Error creating collection $TEST_RGB2| tee -a $LOG
-if $RASQL -q "select r from RAS_COLLECTIONNAMES as r" --out string|grep -w test_rgb
+if $RASQL -q "select r from RAS_COLLECTIONNAMES as r" --out string|grep -w $TEST_RGB2
then
echo create collection $TEST_RGB2 RGBSet successfully ... | tee -a $LOG
else
@@ -219,7 +219,7 @@ else
fi
fi
#==========================test by queries==================================================
- if [ ! -f $QUERY_DIR/*.rasql ]
+ if [ ! -f "$QUERY_DIR/*.rasql" ]
then
echo "there is no rasql for test in the "$QUERY_DIR
else
@@ -276,4 +276,4 @@ fi
exit $CODE_OK
else
exit $CODE_FAIL
- fi \ No newline at end of file
+ fi