Commit 48b34321 authored by Olaf Lenz's avatar Olaf Lenz

Fixes to the testsuite, fix to script dir copying.

parent 7a5f0284
......@@ -41,9 +41,9 @@ analysis of time series. Similarly, some special cases of using the
correlator have their redundant counterparts in the analysis in Tcl
(Chapter~\ref{chap:analysis}), but the correlator provides a general
and versatile toolbox which can be used with any implemented
core-observables. The only trick to bridge the gap between TCL based
core-observables. The only trick to bridge the gap between Tcl based
analysis and core analysis is the tclcommand observable that allows
use the return value of arbitrary TCL functions (also self-written)
use the return value of arbitrary Tcl functions (also self-written)
as input for the core analysis. See more below.
\section{Observables}
......
......@@ -38,13 +38,18 @@ EXTRA_DIST=$(ESSCRIPTS)
# copy the scripts files from the source dir to the obj dir if they are different
# using INSTALL_DATA here as the scripts should not be executable
all:
.PHONY: copy-scripts
FORCE:
copy-scripts: FORCE
for file in $(ESSCRIPTS); do \
if test ! -e $$file || test ! $$file -ef $(abs_srcdir)/$$file; then \
$(INSTALL_DATA) $(abs_srcdir)/$$file $(abs_builddir); \
fi; \
done
all-local: copy-scripts
check-local: copy-scripts
clean-local:
for file in $(ESSCRIPTS); do \
if test -e $$file && test ! $$file -ef $(abs_srcdir)/$$file; then \
......
......@@ -52,7 +52,7 @@ if {!$quiet} {
puts "* ============ *"
puts "* A Parallel Molecular Dynamics Program *"
puts "* *"
puts "* (c) 2010,2011 *"
puts "* (c) 2010,2011,2012 *"
puts "* The ESPResSo project *"
puts "* *"
puts "* (c) 2002,2003,2004,2005,2006,2007,2008,2009,2010 *"
......@@ -61,6 +61,8 @@ if {!$quiet} {
puts "* *"
puts "*******************************************************"
puts ""
puts "This is [code_info version]."
puts ""
puts "ESPResSo is free software: you can redistribute it and/or modify"
puts "it under the terms of the GNU General Public License as published by"
puts "the Free Software Foundation, either version 3 of the License, or"
......
......@@ -39,7 +39,7 @@ catch {
# Initialise our own env variables:
foreach {var val} {
PROMPT ">"
PROMPT "> "
HISTORY ""
HISTORY_BUFFER 100
COMPLETION_MATCH ""
......
......@@ -31,7 +31,7 @@ tests = \
correlation.tcl \
constraints_rhomboid.tcl \
dh.tcl \
dielectric_test.tcl \
dielectric.tcl \
el2d.tcl \
el2d_die.tcl \
el2d_nonneutral.tcl \
......@@ -104,7 +104,7 @@ EXTRA_DIST = $(tests) $(deactivated_tests) \
lb_system.data \
\
pe_micelle.tcl pe_micelle.data \
uwerr_test.tcl uwerr_test.data \
uwerr.tcl uwerr.data \
\
gen_fene.tcl gen_harm.tcl \
\
......
......@@ -17,6 +17,7 @@
#
source "tests_common.tcl"
require_feature "ELECTROSTATICS"
require_feature "CONSTRAINTS"
require_feature "EXTERNAL_FORCES"
......
......@@ -31,7 +31,7 @@ proc blubb {vec} {
return [expr -1 * log([lindex $vec 1] / [lindex $vec 0])]
}
set df [open "uwerr_test.data" r]
set df [open "uwerr.data" r]
while {![eof $df]} {
gets $df row
lappend data [split $row " "]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment