Changeset: f1b3c1fc7c23 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1b3c1fc7c23 Removed Files: ArraysTests/Tests/All ArraysTests/Tests/Mtest.py.backup ArraysTests/Tests/approveTests.sh ArraysTests/Tests/create.sql ArraysTests/Tests/drop.sql ArraysTests/Tests/query_2d.sql ArraysTests/Tests/query_2d_no.sql ArraysTests/Tests/query_3d.sql ArraysTests/Tests/query_3d_no.sql ArraysTests/Tests/runTests.sh ArraysTests/Tests/tests.sql ArraysTests/Tests/tests.stable.err ArraysTests/Tests/tests.stable.out Branch: arrays Log Message:
removed test that were not used diffs (truncated from 5170 to 300 lines): diff --git a/ArraysTests/Tests/All b/ArraysTests/Tests/All deleted file mode 100644 --- a/ArraysTests/Tests/All +++ /dev/null @@ -1,1 +0,0 @@ -tests diff --git a/ArraysTests/Tests/Mtest.py.backup b/ArraysTests/Tests/Mtest.py.backup deleted file mode 100755 --- a/ArraysTests/Tests/Mtest.py.backup +++ /dev/null @@ -1,4279 +0,0 @@ -#!/usr/bin/python2 - -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2008-2015 MonetDB B.V. - -#TODO: -#===== -# - check all TODO's below -# - tidy -up HTML-generation by "keeping in mind" during testing, -# which OUT/ERR differ or not and which tests were skipped. -# dump HTML-stuff only at end -# print an ascii summary at end, too -# - if no diffs, but warnings, say so at end -# - produce, keep & reference LOG -# - add a "grep-like" function and replace "inlined" grep -# contains(<file>,<string>) -# - do multi-level prompting? -# - normalize all path's used -# - Python 3? (or do a full rewrite?) - -import os -import sys -import shutil -import re -import random -import time -import socket -import struct -import signal -import Mfilter -import fnmatch -import glob - -procdebug = False -verbose = False -quiet = False - -releaserun = False - -# whether output goes to a tty -isatty = os.isatty(sys.stdout.fileno()) - -if os.name != 'nt' and isatty: - # color output a little - RED = '\033[1;31m' - GREEN = '\033[0;32m' - PURPLE = '\033[1;35m' # actually magenta - BLACK = '\033[0;0m' -else: - # no coloring if not to a tty - RED = GREEN = PURPLE = BLACK = '' - -def ErrExit(msg): - print >> sys.stderr, msg - sys.exit(1) - -def _configure(str): - # expand configure variables in str and return result - config = [ - ('{source}', '/ufs/alvanaki/DEV/MonetDB-arrays'), - ('${build}', '/ufs/alvanaki/BUILD/MonetDB-arrays'), - - ('${bindir}', '${exec_prefix}/bin'), -## ('${sbindir}', '@QXsbindir@'), - ('${libexecdir}', '${exec_prefix}/libexec'), - ('${datarootdir}', '${prefix}/share'), - ('${datadir}', '${prefix}/share'), - ('${sysconfdir}', '${prefix}/etc'), -## ('${sharedstatedir}', '@QXsharedstatedir@'), - ('${localstatedir}', '${prefix}/var'), - ('${libdir}', '${exec_prefix}/lib'), - ('${includedir}', '${prefix}/include'), -## ('${oldincludedir}', '@QXoldincludedir@'), - ('${infodir}', '${datarootdir}/info'), - ('${mandir}', '${datarootdir}/man'), - ('${Qbindir}', '${exec_prefix}/bin'), -## ('${Qsbindir}', '@QXsbindir@'), - ('${Qlibexecdir}', '${exec_prefix}/libexec'), - ('${Qdatarootdir}', '${prefix}/share'), - ('${Qdatadir}', '${prefix}/share'), - ('${Qsysconfdir}', '${prefix}/etc'), -## ('${Qsharedstatedir}', '@QXsharedstatedir@'), - ('${Qlocalstatedir}', '${prefix}/var'), - ('${Qlibdir}', '${exec_prefix}/lib'), - ('${Qincludedir}', '${prefix}/include'), -## ('${Qoldincludedir}', '@QXoldincludedir@'), - ('${Qinfodir}', '${datarootdir}/info'), - ('${Qmandir}', '${datarootdir}/man'), - # put these at end (in this order!) for efficiency - ('${exec_prefix}', '${prefix}'), - ('${Qexec_prefix}', '${prefix}'), - ('${prefix}', '/export/scratch2/alvanaki/INSTALL/MonetDB-arrays'), - ('${Qprefix}', '/export/scratch2/alvanaki/INSTALL/MonetDB-arrays'), - ] - if os.name == 'nt': - str = str.replace('%prefix%', '${prefix}') - str = str.replace('%exec_prefix%', '${exec_prefix}') - changed = True - while '$' in str and changed: - changed = False - for key, val in config: - if os.name == 'nt': - val = val.replace('%prefix%', '${prefix}') - val = val.replace('%exec_prefix%', '${exec_prefix}') - nstr = str.replace(key, val) - changed = changed or str != nstr - str = nstr - return str - -# use our own process module because it has _BufferedPipe -try: - import process -except ImportError: - try: - import MonetDBtesting.process as process - except ImportError: - p = _configure(os.path.join('/export/scratch2/alvanaki/INSTALL/MonetDB-arrays', 'lib/python2.7/site-packages')) - sys.path.insert(0, p) - import MonetDBtesting.process as process - if os.environ.has_key('PYTHONPATH'): - p += os.pathsep + os.environ['PYTHONPATH'] - os.environ['PYTHONPATH'] = p - -# Replace os.fork by a version that forks but also sets the process -# group in the child. This is done so that we can easily kill a -# subprocess and its children in case of a timeout. -# To use this, set the global variable setpgrp to True before calling -# subprocess.Popen. It is reset automatically to False so that -# subprocess of our child don't get their own process group. -try: - os.setpgrp -except AttributeError: - try: - os.setpgid - except AttributeError: - # no function to set process group, so don't replace - pass - else: - # use os.setpgid to set process group - def myfork(osfork = os.fork): - global setpgrp - _setpgrp = setpgrp - setpgrp = False - pid = osfork() - if pid == 0 and _setpgrp: - os.setpgrp() - return pid - os.fork = myfork -else: - # use os.setpgrp to set process group - def myfork(osfork = os.fork): - global setpgrp - _setpgrp = setpgrp - setpgrp = False - pid = osfork() - if pid == 0 and _setpgrp: - os.setpgid(0, 0) - return pid - os.fork = myfork -setpgrp = False - -ttywidth = 0 -if isatty and os.isatty(sys.stdin.fileno()): - if os.name != 'nt': - ttywidth = 80 - else: - try: - proc = process.Popen(['stty', '-a'], stdout = process.PIPE, - stderr = process.PIPE) - except OSError: - pass - else: - out, err = proc.communicate() - res = re.search('columns ([0-9]+)', out) - if res is not None: - ttywidth = int(res.group(1)) - else: - res = re.search(' ([0-9]+) columns', out) - if res is not None: - ttywidth = int(res.group(1)) - if ttywidth < 60: - # rediculously narrow tty, ignore value - ttywidth = 0 - -import string # for whitespace -def splitcommand(cmd): - '''Like string.split, except take quotes into account.''' - q = None - w = [] - command = [] - for c in cmd: - if q: - if c == q: - q = None - else: - w.append(c) - elif c in string.whitespace: - if w: - command.append(''.join(w)) - w = [] - elif c == '"' or c == "'": - q = c - else: - w.append(c) - if w: - command.append(''.join(w)) - if len(command) > 1 and command[0] == 'call': - del command[0] - return command - -def remove(file): - try: - os.remove(file) - except: - pass - -def isexecutable(TST, ext = '.sh') : - if os.name == "nt": - for ext in ".exe", ".com", ".bat", ".cmd": - if TST.lower().endswith(ext): - ext = '' - if os.path.isfile(TST+ext) or os.path.isfile(TST+ext+".src"): - return [ 1, ext ] - elif os.name == "posix": - #TODO: - # check with "file", and set executable - TST += ext - if ( os.path.isfile(TST ) and os.access(TST ,os.X_OK) ) or \ - ( os.path.isfile(TST+".src") and os.access(TST+".src",os.X_OK) ): - return [ 1, ext ] - #TODO: - #else: - # ??? - return [ 0, "" ] -### isexecutable(TST, ext = '.sh') # - -def CheckExec(cmd) : - for p in os.environ['PATH'].split(os.pathsep): - x = isexecutable(os.path.join(p,cmd),'') - if x[0]: - return os.path.join(p, cmd + x[1]) - return "" -### CheckExec(cmd) # - -try: - import monet_options -except ImportError: - try: - from MonetDBtesting import monet_options - except ImportError: - p = _configure(os.path.join('/export/scratch2/alvanaki/INSTALL/MonetDB-arrays', 'lib/python2.7/site-packages')) - sys.path.insert(0, p) - from MonetDBtesting import monet_options - if os.environ.has_key('PYTHONPATH'): - p += os.pathsep + os.environ['PYTHONPATH'] - os.environ['PYTHONPATH'] = p - -import threading - -randomPortRepeat = 9 - -F_SKIP = -1 -F_OK = 0 -F_WARN = 1 -F_SOCK = 2 -F_ERROR = 3 -F_TIME = 4 -F_ABRT = 5 -F_RECU = 6 -F_SEGV = 7 - -FAILURES = { - F_SKIP : ("F_SKIP", '-'), - F_OK : ("F_OK", 'o'), - F_WARN : ("F_WARN", 'x'), - F_SOCK : ("F_SOCK", 'S'), - F_ERROR : ("F_ERROR", 'X'), - F_TIME : ("F_TIME", 'T'), - F_ABRT : ("F_ABRT", 'A'), - F_RECU : ("F_RECU", 'R'), - F_SEGV : ("F_SEGV", 'C'), -} - -CONDITIONALS = { - # X == true => @X_TRUE@='', @X_FALSE@='#' - # X == false => @X_TRUE@='#', @X_FALSE@='' _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
