[Avida-SVN] r1635 - in development: Avida.xcodeproj source/script source/targets/avida-s source/tools tests tests/_asl_good_001_comment tests/_asl_good_001_comment/config tests/_task_optimize_lim_res tests/_testrunner tests/analyze_dumplandscape tests/analyze_fulllandscape_1step tests/analyze_fulllandscape_2step tests/analyze_truncate_lineage tests/analyze_truncate_lineage_fulllandscape tests/avida_GA_lim_res tests/bgs_dyn_mutrates_births tests/bgs_dyn_mutrates_fit tests/bgs_dyn_mutrates_rank tests/default_classic_100u tests/default_classic_500u tests/default_transsmt_100u tests/demes_classic_torus tests/demes_clique_repl tests/demes_germline tests/demes_grid_repl tests/demes_hex_repl tests/demes_torus_repl tests/fitvalley_dynamic_mutrate tests/green_beard_instructions tests/midrun_classsic_30u tests/string_match_embed3 tests/task_sort_analyze
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Fri Jun 1 14:43:17 PDT 2007
Author: brysonda
Date: 2007-06-01 17:43:17 -0400 (Fri, 01 Jun 2007)
New Revision: 1635
Added:
development/tests/_asl_good_001_comment/
development/tests/_asl_good_001_comment/config/
development/tests/_asl_good_001_comment/config/main.asl
development/tests/_asl_good_001_comment/expected/
development/tests/_asl_good_001_comment/test_list
Modified:
development/Avida.xcodeproj/project.pbxproj
development/source/script/cASLibrary.h
development/source/script/cASSymbol.h
development/source/script/cParser.cc
development/source/script/cParser.h
development/source/script/cScriptObject.h
development/source/script/cSymbolTable.h
development/source/targets/avida-s/main.cc
development/source/tools/cFile.h
development/tests/_task_optimize_lim_res/test_list
development/tests/_testrunner/testrunner.py
development/tests/analyze_dumplandscape/test_list
development/tests/analyze_fulllandscape_1step/test_list
development/tests/analyze_fulllandscape_2step/test_list
development/tests/analyze_truncate_lineage/test_list
development/tests/analyze_truncate_lineage_fulllandscape/test_list
development/tests/avida_GA_lim_res/test_list
development/tests/bgs_dyn_mutrates_births/test_list
development/tests/bgs_dyn_mutrates_fit/test_list
development/tests/bgs_dyn_mutrates_rank/test_list
development/tests/default_classic_100u/test_list
development/tests/default_classic_500u/test_list
development/tests/default_transsmt_100u/test_list
development/tests/demes_classic_torus/test_list
development/tests/demes_clique_repl/test_list
development/tests/demes_germline/test_list
development/tests/demes_grid_repl/test_list
development/tests/demes_hex_repl/test_list
development/tests/demes_torus_repl/test_list
development/tests/fitvalley_dynamic_mutrate/test_list
development/tests/green_beard_instructions/test_list
development/tests/midrun_classsic_30u/test_list
development/tests/string_match_embed3/test_list
development/tests/task_sort_analyze/test_list
Log:
- AvidaScript checkpoint commit
- Add basic first (disabled) test of AvidaScript
- Update TestRunner to better support alternative applications
- Update all of the test list files to reference the new name of the default app variable
- Remove the -mpowerpc-gpopt from the general Deployment configuration of Xcode. G4 processors don't support some of the instructions used (making the G5 configuration even more useful).
Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/Avida.xcodeproj/project.pbxproj 2007-06-01 21:43:17 UTC (rev 1635)
@@ -751,7 +751,7 @@
70DCAC77097AF730002F8733 /* key_chart */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = key_chart; sourceTree = "<group>"; };
70DCAC78097AF730002F8733 /* viewer.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = viewer.cc; sourceTree = "<group>"; };
70DCAC9B097AF7C0002F8733 /* primitive.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = primitive.cc; sourceTree = "<group>"; };
- 70DCAD1C097AF7CC002F8733 /* avida-s */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "avida-s"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 70DCAD1C097AF7CC002F8733 /* avida-s */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = "avida-s"; sourceTree = BUILT_PRODUCTS_DIR; };
70DCAD1F097AF81A002F8733 /* AvidaScript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AvidaScript.h; sourceTree = "<group>"; };
70DCAD20097AF81A002F8733 /* cLexer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cLexer.h; sourceTree = "<group>"; };
70DCAD21097AF81A002F8733 /* cLexer.l */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.lex; path = cLexer.l; sourceTree = "<group>"; };
@@ -2107,7 +2107,7 @@
GCC_STRICT_ALIASING = YES;
GCC_UNROLL_LOOPS = YES;
PER_ARCH_CFLAGS_i386 = "-DCOMPILE_ARCH=\\\"Intel\\\"";
- PER_ARCH_CFLAGS_ppc = "-DCOMPILE_ARCH=\\\"G4-G5\\\" -mpowerpc-gpopt -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ftree-loop-linear -fsched-interblock -fgcse-sm";
+ PER_ARCH_CFLAGS_ppc = "-DCOMPILE_ARCH=\\\"G4-G5\\\" -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -falign-loops=16 -falign-jumps=16 -falign-functions=16 -ftree-loop-linear -fsched-interblock -fgcse-sm";
SEPARATE_STRIP = YES;
WARNING_CFLAGS = (
"-Wextra",
Modified: development/source/script/cASLibrary.h
===================================================================
--- development/source/script/cASLibrary.h 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/source/script/cASLibrary.h 2007-06-01 21:43:17 UTC (rev 1635)
@@ -42,16 +42,4 @@
cASLibrary() { ; }
};
-
-#ifdef ENABLE_UNIT_TESTS
-namespace nASLibrary {
- /**
- * Run unit tests
- *
- * @param full Run full test suite; if false, just the fast tests.
- **/
- void UnitTests(bool full = false);
-}
#endif
-
-#endif
Modified: development/source/script/cASSymbol.h
===================================================================
--- development/source/script/cASSymbol.h 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/source/script/cASSymbol.h 2007-06-01 21:43:17 UTC (rev 1635)
@@ -41,15 +41,4 @@
};
-#ifdef ENABLE_UNIT_TESTS
-namespace nASSymbol {
- /**
- * Run unit tests
- *
- * @param full Run full test suite; if false, just the fast tests.
- **/
- void UnitTests(bool full = false);
-}
-#endif
-
#endif
Modified: development/source/script/cParser.cc
===================================================================
--- development/source/script/cParser.cc 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/source/script/cParser.cc 2007-06-01 21:43:17 UTC (rev 1635)
@@ -25,8 +25,13 @@
#include "cParser.h"
#include "AvidaScript.h"
+#include "cFile.h"
/*
+ The following represents the grammar for AvidaScript in BNF, adjusted so that it is compatible with recursive descent
+ parsing (to be) implemented by cParser.
+
+
script: statement_list
statement_list: statement statement_list
@@ -138,11 +143,17 @@
declare_function: REF CMD_FUNCTION type_any ID PREC_OPEN var_declare_list PREC_CLOSE ENDL
define_function: CMD_FUNCTION type_any ID PREC_OPEN var_declare_list PREC_CLOSE ENDL statement_list CMD_ENDFUNCTION
+
+ @TODO - return
+ @TODO - array definitions
+ @TODO - suppress
+ @TODO - ARR_OPEN ARR_CLOSE as block open/close.
+ @TODO - function variant with block rather than endfunction.
*/
-cScriptObject* cParser::Parse(std::istream* input)
+bool cParser::Parse(cFile& input)
{
- m_lexer = new cLexer(input);
+ m_lexer = new cLexer(input.GetFileStream());
int tok = m_lexer->yylex();
while (tok) {
@@ -152,5 +163,11 @@
delete m_lexer;
- return NULL;
+ return m_success;
}
+
+
+void cParser::Accept(cASTVisitor& visitor)
+{
+
+}
Modified: development/source/script/cParser.h
===================================================================
--- development/source/script/cParser.h 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/source/script/cParser.h 2007-06-01 21:43:17 UTC (rev 1635)
@@ -27,6 +27,9 @@
#include <iostream>
+#ifndef ASTree_h
+#include "ASTree.h"
+#endif
#ifndef cASLibrary_h
#include "cASLibrary.h"
#endif
@@ -40,32 +43,26 @@
#include "cSymbolTable.h"
#endif
+class cFile;
+
class cParser
{
private:
cASLibrary* m_library;
cLexer* m_lexer;
- cSymbolTable* m_symtbl;
+ cASTNode* m_tree;
+ bool m_success;
+
cParser();
public:
- cParser(cASLibrary* library) : m_library(library), m_symtbl(NULL) { ; }
+ cParser(cASLibrary* library) : m_library(library), m_success(true) { ; }
- cScriptObject* Parse(std::istream* input);
+ bool Parse(cFile& input);
+
+ void Accept(cASTVisitor& visitor);
};
-
-#ifdef ENABLE_UNIT_TESTS
-namespace nParser {
- /**
- * Run unit tests
- *
- * @param full Run full test suite; if false, just the fast tests.
- **/
- void UnitTests(bool full = false);
-}
-#endif
-
#endif
Modified: development/source/script/cScriptObject.h
===================================================================
--- development/source/script/cScriptObject.h 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/source/script/cScriptObject.h 2007-06-01 21:43:17 UTC (rev 1635)
@@ -34,15 +34,4 @@
};
-#ifdef ENABLE_UNIT_TESTS
-namespace nScriptObject {
- /**
- * Run unit tests
- *
- * @param full Run full test suite; if false, just the fast tests.
- **/
- void UnitTests(bool full = false);
-}
-#endif
-
#endif
Modified: development/source/script/cSymbolTable.h
===================================================================
--- development/source/script/cSymbolTable.h 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/source/script/cSymbolTable.h 2007-06-01 21:43:17 UTC (rev 1635)
@@ -43,15 +43,4 @@
};
-#ifdef ENABLE_UNIT_TESTS
-namespace nSymbolTable {
- /**
- * Run unit tests
- *
- * @param full Run full test suite; if false, just the fast tests.
- **/
- void UnitTests(bool full = false);
-}
-#endif
-
#endif
Modified: development/source/targets/avida-s/main.cc
===================================================================
--- development/source/targets/avida-s/main.cc 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/source/targets/avida-s/main.cc 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,6 +1,6 @@
/*
* main.cc
- * avida_test_language
+ * Avida
*
* Created by David on 1/13/06.
* Copyright 1999-2007 Michigan State University. All rights reserved.
@@ -23,6 +23,7 @@
*/
#include "cASLibrary.h"
+#include "cFile.h"
#include "cParser.h"
#include <iostream>
@@ -32,7 +33,9 @@
{
cASLibrary* lib = new cASLibrary;
cParser* parser = new cParser(lib);
- parser->Parse(&std::cin);
+ cFile file;
+ if (file.Open("main.asl")) parser->Parse(file);
+
return 0;
}
Modified: development/source/tools/cFile.h
===================================================================
--- development/source/tools/cFile.h 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/source/tools/cFile.h 2007-06-01 21:43:17 UTC (rev 1635)
@@ -90,6 +90,10 @@
**/
bool Open(cString _filename, std::ios::openmode mode=(std::ios::in));
+ // Access to the underlying implmentation
+ std::fstream* GetFileStream() { return &fp; }
+
+
/**
* Close the currently open file.
**/
Added: development/tests/_asl_good_001_comment/config/main.asl
===================================================================
--- development/tests/_asl_good_001_comment/config/main.asl (rev 0)
+++ development/tests/_asl_good_001_comment/config/main.asl 2007-06-01 21:43:17 UTC (rev 1635)
@@ -0,0 +1,2 @@
+# This is only a comment, nothing else
+
Added: development/tests/_asl_good_001_comment/test_list
===================================================================
--- development/tests/_asl_good_001_comment/test_list (rev 0)
+++ development/tests/_asl_good_001_comment/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -0,0 +1,36 @@
+;--- Begin Test Configuration File (test_list) ---
+[main]
+; Command line arguments to pass to the application
+args =
+app = %(builddir)s/work/avida-s
+nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
+ ; disallow - treat non-zero exit codes as failures
+ ; allow - all exit codes are acceptable
+ ; require - treat zero exit codes as failures, useful
+ ; for creating tests for app error checking
+createdby = David Bryson ; Who created the test
+email = brysonda at egr.msu.edu ; Email address for the test's creator
+
+[consistency]
+enabled = yes ; Is this test a consistency test?
+long = no ; Is this test a long test?
+
+[performance]
+enabled = no ; Is this test a performance test?
+long = no ; Is this test a long test?
+
+; The following variables can be used in constructing setting values by calling
+; them with %(variable_name)s. For example see 'app' above.
+;
+; builddir
+; cpus
+; default_app
+; mode
+; perf_repeat
+; perf_user_margin
+; perf_wall_margin
+; svn
+; svnmetadir
+; svnversion
+; testdir
+;--- End Test Configuration File ---
Modified: development/tests/_task_optimize_lim_res/test_list
===================================================================
--- development/tests/_task_optimize_lim_res/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/_task_optimize_lim_res/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
-[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+[main]
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/_testrunner/testrunner.py
===================================================================
--- development/tests/_testrunner/testrunner.py 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/_testrunner/testrunner.py 2007-06-01 21:43:17 UTC (rev 1635)
@@ -52,7 +52,7 @@
# Global Constants
# ---------------------------------------------------------------------------------------------------------------------------
-TESTRUNNER_VERSION = "1.4"
+TESTRUNNER_VERSION = "1.4b"
TESTRUNNER_COPYRIGHT = "2007"
TRUE_STRINGS = ("y","Y","yes","Yes","true","True","1")
@@ -172,8 +172,10 @@
test_list = ";--- Begin Test Configuration File (%s) ---" % TEST_LIST
test_list += """
[main]
-args = ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args =
+
+app = %(default_app)s ; Application path to test
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
@@ -283,7 +285,10 @@
# Load the App for the test and check that it exists
- self.app = self.getSetting("main", "app")
+ try:
+ self.app = self.cfg.get('main', 'app', False, settings)
+ except:
+ self.app = settings['default_app']
self.app = os.path.abspath(self.app)
if not os.path.exists(self.app):
print "Error: Application (%s) not found" % self.app
@@ -321,17 +326,6 @@
- # string cTest::getSetting(string sect, string opt) {
- def getSetting(self, sect, opt):
- global settings
- try:
- return self.cfg.get(sect, opt, False, settings)
- except:
- return settings[opt]
- # } // End of cTest::getSetting()
-
-
-
# bool cTest::isConsistencyTest() {
def isConsistencyTest(self): return self.consistency_enabled
# } // End of isConsistencyTest()
@@ -896,7 +890,7 @@
# Setup Global Settings
# - settings that begin with an underscore (i.e. _testrunner_name) are for internal use and are not intended for
# use as variables in test_list configuration files
- settings["app"] = "" # App is defined later, since values like builddir can be modified by cmdline settings
+ settings["default_app"] = "" # App is defined later, since values like builddir can be modified by cmdline settings
settings["builddir"] = getConfig("testrunner", "builddir", "build")
settings["mode"] = getConfig("testrunner", "mode", "local")
settings["svn"] = getConfig("testrunner", "svn", "svn")
@@ -996,7 +990,7 @@
# Load the default app to test
try:
- settings["app"] = cfg.get("main", "app")
+ settings["default_app"] = cfg.get("main", "app")
except:
print "Warning: No default app configured"
Modified: development/tests/analyze_dumplandscape/test_list
===================================================================
--- development/tests/analyze_dumplandscape/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/analyze_dumplandscape/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -a ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -a
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/analyze_fulllandscape_1step/test_list
===================================================================
--- development/tests/analyze_fulllandscape_1step/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/analyze_fulllandscape_1step/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -a ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -a
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/analyze_fulllandscape_2step/test_list
===================================================================
--- development/tests/analyze_fulllandscape_2step/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/analyze_fulllandscape_2step/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -a ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -a
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/analyze_truncate_lineage/test_list
===================================================================
--- development/tests/analyze_truncate_lineage/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/analyze_truncate_lineage/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -a ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -a
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/analyze_truncate_lineage_fulllandscape/test_list
===================================================================
--- development/tests/analyze_truncate_lineage_fulllandscape/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/analyze_truncate_lineage_fulllandscape/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -a ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -a
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/avida_GA_lim_res/test_list
===================================================================
--- development/tests/avida_GA_lim_res/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/avida_GA_lim_res/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
-[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+[main]
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/bgs_dyn_mutrates_births/test_list
===================================================================
--- development/tests/bgs_dyn_mutrates_births/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/bgs_dyn_mutrates_births/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,8 +1,9 @@
;--- Begin Test Configuration File (test_list) ---
[main]
+; Command line arguments to pass to the application
args = -s 1 -set BIRTH_METHOD 6 -set NUM_DEMES 30 -set EVENT_FILE events-Test-NumBirthsSelection.cfg -set INST_SET inst_set.divide -set ENVIRONMENT_FILE environment.77 -set WORLD_X 15 -set WORLD_Y 60 -set CHILD_SIZE_RANGE 1.0 -set COPY_MUT_PROB 0.0 -set DIVIDE_INS_PROB 0.0 -set DIVIDE_DEL_PROB 0.0 -set DIV_MUT_PROB 0.03 -set START_CREATURE org.div1
-; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+app = %(default_app)s
+
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/bgs_dyn_mutrates_fit/test_list
===================================================================
--- development/tests/bgs_dyn_mutrates_fit/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/bgs_dyn_mutrates_fit/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,8 +1,9 @@
;--- Begin Test Configuration File (test_list) ---
[main]
+; Command line arguments to pass to the application
args = -s 1 -set BIRTH_METHOD 6 -set NUM_DEMES 30 -set EVENT_FILE events-Test-ParentFitSelection.cfg -set INST_SET inst_set.divide -set ENVIRONMENT_FILE environment.77 -set WORLD_X 15 -set WORLD_Y 60 -set CHILD_SIZE_RANGE 1.0 -set COPY_MUT_PROB 0.0 -set DIVIDE_INS_PROB 0.0 -set DIVIDE_DEL_PROB 0.0 -set DIV_MUT_PROB 0.03 -set START_CREATURE org.div1
-; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/bgs_dyn_mutrates_rank/test_list
===================================================================
--- development/tests/bgs_dyn_mutrates_rank/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/bgs_dyn_mutrates_rank/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,8 +1,9 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 1 -set BIRTH_METHOD 6 -set NUM_DEMES 30 -set EVENT_FILE events-Test-RankSelection.cfg -set INST_SET inst_set.divide -set ENVIRONMENT_FILE environment.77 -set WORLD_X 15 -set WORLD_Y 60 -set CHILD_SIZE_RANGE 1.0 -set COPY_MUT_PROB 0.0 -set DIVIDE_INS_PROB 0.0 -set DIVIDE_DEL_PROB 0.0 -set DIV_MUT_PROB 0.03 -set START_CREATURE org.div1 ; Command line arguments to pass to the application
+; Command line arguments to pass to the application
+args = -s 1 -set BIRTH_METHOD 6 -set NUM_DEMES 30 -set EVENT_FILE events-Test-RankSelection.cfg -set INST_SET inst_set.divide -set ENVIRONMENT_FILE environment.77 -set WORLD_X 15 -set WORLD_Y 60 -set CHILD_SIZE_RANGE 1.0 -set COPY_MUT_PROB 0.0 -set DIVIDE_INS_PROB 0.0 -set DIVIDE_DEL_PROB 0.0 -set DIV_MUT_PROB 0.03 -set START_CREATURE org.div1
-app = %(app)s ; Application path to test
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/default_classic_100u/test_list
===================================================================
--- development/tests/default_classic_100u/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/default_classic_100u/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/default_classic_500u/test_list
===================================================================
--- development/tests/default_classic_500u/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/default_classic_500u/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,8 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-
-args = ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args =
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/default_transsmt_100u/test_list
===================================================================
--- development/tests/default_transsmt_100u/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/default_transsmt_100u/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/demes_classic_torus/test_list
===================================================================
--- development/tests/demes_classic_torus/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/demes_classic_torus/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/demes_clique_repl/test_list
===================================================================
--- development/tests/demes_clique_repl/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/demes_clique_repl/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/demes_germline/test_list
===================================================================
--- development/tests/demes_germline/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/demes_germline/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/demes_grid_repl/test_list
===================================================================
--- development/tests/demes_grid_repl/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/demes_grid_repl/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/demes_hex_repl/test_list
===================================================================
--- development/tests/demes_hex_repl/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/demes_hex_repl/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/demes_torus_repl/test_list
===================================================================
--- development/tests/demes_torus_repl/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/demes_torus_repl/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/fitvalley_dynamic_mutrate/test_list
===================================================================
--- development/tests/fitvalley_dynamic_mutrate/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/fitvalley_dynamic_mutrate/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,8 +1,9 @@
;--- Begin Test Configuration File (test_list) ---
[main]
+; Command line arguments to pass to the application
args = -s 1 -set CHILD_SIZE_RANGE 1 -set DIVIDE_INS_PROB 0 -set DIVIDE_DEL_PROB 0 -set INST_SET instset-reprosA-B.cfg -set START_CREATURE 10reproAs.org -set BASE_MERIT_METHOD 6 -set WORLD_X 10 -set WORLD_Y 10 -set MERIT_BONUS_INST 2 -set COPY_MUT_PROB .1 -set MERIT_BONUS_EFFECT 1 -set EVENT_FILE events-toggleEvery10.cfg -v2 -set META_COPY_MUT .5 -set META_STD_DEV .1 -set MUT_RATE_SOURCE 2 -set NUM_DEMES 1 -set FITNESS_VALLEY 1 -set FITNESS_VALLEY_START 5 -set FITNESS_VALLEY_STOP 6
-; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/green_beard_instructions/test_list
===================================================================
--- development/tests/green_beard_instructions/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/green_beard_instructions/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,8 +1,9 @@
;--- Begin Test Configuration File (test_list) ---
[main]
+; Command line arguments to pass to the application
args = -s 1 -set INST_SET inst_set.SexDonateGbthreshEdtKinRndNopx -set BIRTH_METHOD 0 -set MERIT_GIVEN 5 -set MERIT_RECEIVED 50 -set MAX_DONATE_KIN_DIST 1 -set MAX_DONATE_EDIT_DIST 15 -set MIN_GB_DONATE_THRESHOLD 1 -set MAX_DONATES 100 -set ENVIRONMENT_FILE envZeroResources.cfg -set START_CREATURE organism.sexDefault -set EVENT_FILE eventsFullPopTest.cfg -set WORLD_X 20 -set WORLD_Y 20
-; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/midrun_classsic_30u/test_list
===================================================================
--- development/tests/midrun_classsic_30u/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/midrun_classsic_30u/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/string_match_embed3/test_list
===================================================================
--- development/tests/string_match_embed3/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/string_match_embed3/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -s 100 ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -s 100
+app = %(default_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
Modified: development/tests/task_sort_analyze/test_list
===================================================================
--- development/tests/task_sort_analyze/test_list 2007-06-01 19:13:46 UTC (rev 1634)
+++ development/tests/task_sort_analyze/test_list 2007-06-01 21:43:17 UTC (rev 1635)
@@ -1,7 +1,8 @@
;--- Begin Test Configuration File (test_list) ---
[main]
-args = -a ; Command line arguments to pass to the application
-app = %(app)s ; Application path to test
+; Command line arguments to pass to the application
+args = -a
+app = %(defailt_app)s
nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
; disallow - treat non-zero exit codes as failures
; allow - all exit codes are acceptable
More information about the Avida-cvs
mailing list