[Avida-SVN] r2912 - in branches/collect: . source support/config tests tests/_asl_fail_002_variable_set tests/_asl_fail_002_variable_set/config tests/_asl_good_005_math_whitespace tests/_asl_good_005_math_whitespace/config
blwalker at myxo.css.msu.edu
blwalker at myxo.css.msu.edu
Sat Nov 1 18:02:38 PDT 2008
Author: blwalker
Date: 2008-11-01 21:02:38 -0400 (Sat, 01 Nov 2008)
New Revision: 2912
Added:
branches/collect/support/config/instset-gx.cfg
branches/collect/tests/_asl_fail_002_variable_set/
branches/collect/tests/_asl_fail_002_variable_set/config/
branches/collect/tests/_asl_fail_002_variable_set/config/main.asl
branches/collect/tests/_asl_fail_002_variable_set/expected/
branches/collect/tests/_asl_fail_002_variable_set/test_list
branches/collect/tests/_asl_good_005_math_whitespace/
branches/collect/tests/_asl_good_005_math_whitespace/config/
branches/collect/tests/_asl_good_005_math_whitespace/config/main.asl
branches/collect/tests/_asl_good_005_math_whitespace/expected/
branches/collect/tests/_asl_good_005_math_whitespace/test_list
Removed:
branches/collect/consistencytests/
branches/collect/source/third-party/
branches/collect/tests/_asl_fail_002_variable_set/config/
branches/collect/tests/_asl_fail_002_variable_set/config/main.asl
branches/collect/tests/_asl_fail_002_variable_set/expected/
branches/collect/tests/_asl_fail_002_variable_set/test_list
branches/collect/tests/_asl_good_005_math_whitespace/config/
branches/collect/tests/_asl_good_005_math_whitespace/config/main.asl
branches/collect/tests/_asl_good_005_math_whitespace/expected/
branches/collect/tests/_asl_good_005_math_whitespace/test_list
Log:
Preparing the collect branch for merging back into the development branch. This commit fixes some non-added or un-deleted files left behind by previous porting from development to commit, and should ensure that nothing weird happens in the final merge.
Copied: branches/collect/support/config/instset-gx.cfg (from rev 1549, development/support/config/instset-gx.cfg)
===================================================================
--- branches/collect/support/config/instset-gx.cfg (rev 0)
+++ branches/collect/support/config/instset-gx.cfg 2008-11-02 01:02:38 UTC (rev 2912)
@@ -0,0 +1,35 @@
+nop-A 1 # a
+nop-B 1 # b
+nop-C 1 # c
+if-n-equ 1 # d
+if-less 1 # e
+pop 1 # f
+push 1 # g
+swap-stk 1 # h
+swap 1 # i
+shift-r 1 # j
+shift-l 1 # k
+inc 1 # l
+dec 1 # m
+add 1 # n
+sub 1 # o
+nand 1 # p
+IO 1 # q Puts current contents of register and gets new.
+
+site 1 # r
+bind 1 # s
+bind2 1 # s
+if-bind 1 # t
+if-bind2 1 # u
+num-sites 1 # v
+g-alloc 1 # w
+p-alloc 1 # x
+p-copy 1 # y
+p-divide 1 # z
+goto 1 # A
+label 1 # B
+
+PROGRAMID 0 0 # C
+EXECUTABLE 0 0 # D
+BINDABLE 0 0 # E
+READABLE 0 0 # F
Copied: branches/collect/tests/_asl_fail_002_variable_set (from rev 2911, development/tests/_asl_fail_002_variable_set)
Copied: branches/collect/tests/_asl_fail_002_variable_set/config (from rev 2911, development/tests/_asl_fail_002_variable_set/config)
Deleted: branches/collect/tests/_asl_fail_002_variable_set/config/main.asl
===================================================================
--- development/tests/_asl_fail_002_variable_set/config/main.asl 2008-11-01 23:23:53 UTC (rev 2911)
+++ branches/collect/tests/_asl_fail_002_variable_set/config/main.asl 2008-11-02 01:02:38 UTC (rev 2912)
@@ -1,3 +0,0 @@
-# A type with no variable name
-int x = ;
-
Copied: branches/collect/tests/_asl_fail_002_variable_set/config/main.asl (from rev 2911, development/tests/_asl_fail_002_variable_set/config/main.asl)
===================================================================
--- branches/collect/tests/_asl_fail_002_variable_set/config/main.asl (rev 0)
+++ branches/collect/tests/_asl_fail_002_variable_set/config/main.asl 2008-11-02 01:02:38 UTC (rev 2912)
@@ -0,0 +1,3 @@
+# A type with no variable name
+int x = ;
+
Copied: branches/collect/tests/_asl_fail_002_variable_set/expected (from rev 2911, development/tests/_asl_fail_002_variable_set/expected)
Deleted: branches/collect/tests/_asl_fail_002_variable_set/test_list
===================================================================
--- development/tests/_asl_fail_002_variable_set/test_list 2008-11-01 23:23:53 UTC (rev 2911)
+++ branches/collect/tests/_asl_fail_002_variable_set/test_list 2008-11-02 01:02:38 UTC (rev 2912)
@@ -1,32 +0,0 @@
-;--- Begin Test Configuration File (test_list) ---
-[main]
-; Command line arguments to pass to the application
-args =
-app = %(builddir)s/work/avida-s
-nonzeroexit = require
-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 ---
Copied: branches/collect/tests/_asl_fail_002_variable_set/test_list (from rev 2911, development/tests/_asl_fail_002_variable_set/test_list)
===================================================================
--- branches/collect/tests/_asl_fail_002_variable_set/test_list (rev 0)
+++ branches/collect/tests/_asl_fail_002_variable_set/test_list 2008-11-02 01:02:38 UTC (rev 2912)
@@ -0,0 +1,32 @@
+;--- Begin Test Configuration File (test_list) ---
+[main]
+; Command line arguments to pass to the application
+args =
+app = %(builddir)s/work/avida-s
+nonzeroexit = require
+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 ---
Copied: branches/collect/tests/_asl_good_005_math_whitespace (from rev 2911, development/tests/_asl_good_005_math_whitespace)
Copied: branches/collect/tests/_asl_good_005_math_whitespace/config (from rev 2911, development/tests/_asl_good_005_math_whitespace/config)
Deleted: branches/collect/tests/_asl_good_005_math_whitespace/config/main.asl
===================================================================
--- development/tests/_asl_good_005_math_whitespace/config/main.asl 2008-11-01 23:23:53 UTC (rev 2911)
+++ branches/collect/tests/_asl_good_005_math_whitespace/config/main.asl 2008-11-02 01:02:38 UTC (rev 2912)
@@ -1,5 +0,0 @@
-# test arbitrary whitespace
-
-
-int abc = 54 + 37;
-
Copied: branches/collect/tests/_asl_good_005_math_whitespace/config/main.asl (from rev 2911, development/tests/_asl_good_005_math_whitespace/config/main.asl)
===================================================================
--- branches/collect/tests/_asl_good_005_math_whitespace/config/main.asl (rev 0)
+++ branches/collect/tests/_asl_good_005_math_whitespace/config/main.asl 2008-11-02 01:02:38 UTC (rev 2912)
@@ -0,0 +1,5 @@
+# test arbitrary whitespace
+
+
+int abc = 54 + 37;
+
Copied: branches/collect/tests/_asl_good_005_math_whitespace/expected (from rev 2911, development/tests/_asl_good_005_math_whitespace/expected)
Deleted: branches/collect/tests/_asl_good_005_math_whitespace/test_list
===================================================================
--- development/tests/_asl_good_005_math_whitespace/test_list 2008-11-01 23:23:53 UTC (rev 2911)
+++ branches/collect/tests/_asl_good_005_math_whitespace/test_list 2008-11-02 01:02:38 UTC (rev 2912)
@@ -1,32 +0,0 @@
-;--- Begin Test Configuration File (test_list) ---
-[main]
-; Command line arguments to pass to the application
-args =
-app = %(builddir)s/work/avida-s
-nonzeroexit = disallow
-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 ---
Copied: branches/collect/tests/_asl_good_005_math_whitespace/test_list (from rev 2911, development/tests/_asl_good_005_math_whitespace/test_list)
===================================================================
--- branches/collect/tests/_asl_good_005_math_whitespace/test_list (rev 0)
+++ branches/collect/tests/_asl_good_005_math_whitespace/test_list 2008-11-02 01:02:38 UTC (rev 2912)
@@ -0,0 +1,32 @@
+;--- Begin Test Configuration File (test_list) ---
+[main]
+; Command line arguments to pass to the application
+args =
+app = %(builddir)s/work/avida-s
+nonzeroexit = disallow
+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 ---
More information about the Avida-cvs
mailing list