[teyjus] r1173 committed - Moved the renaming tests to renaming_tests...

[tey...@googlecode.com]

Revision: 1173
Author: mitc...@gmail.com
Date: Tue Jan 27 07:15:08 2015 UTC
Log: Moved the renaming tests to renaming_tests

The structure for the renaming tests is different enough to
warrant their own folder. A simple testing framework via
OMake is in place for comparing the compiled versions of
modules (with renaming) to specified equivalents (without
renaming), and the renaming tests are by included in the
'omake test' directive.


https://code.google.com/p/teyjus/source/detail?r=1173

Added:
/branches/RenamingRedux/source/test/renaming_tests
/branches/RenamingRedux/source/test/renaming_tests/OMakefile
/branches/RenamingRedux/source/test/renaming_tests/test1
/branches/RenamingRedux/source/test/renaming_tests/test1/base.sig
/branches/RenamingRedux/source/test/renaming_tests/test1/expected.mod
/branches/RenamingRedux/source/test/renaming_tests/test1/expected.sig
/branches/RenamingRedux/source/test/renaming_tests/test1/include.mod
/branches/RenamingRedux/source/test/renaming_tests/test1/include.sig
/branches/RenamingRedux/source/test/renaming_tests/test1/main.om
/branches/RenamingRedux/source/test/renaming_tests/test1/renametoself.mod
/branches/RenamingRedux/source/test/renaming_tests/test1/renametoself.sig
/branches/RenamingRedux/source/test/renaming_tests/test2
/branches/RenamingRedux/source/test/renaming_tests/test2/accumulating.mod
/branches/RenamingRedux/source/test/renaming_tests/test2/accumulating.sig
/branches/RenamingRedux/source/test/renaming_tests/test2/base.sig
/branches/RenamingRedux/source/test/renaming_tests/test2/expected.mod
/branches/RenamingRedux/source/test/renaming_tests/test2/expected.sig
/branches/RenamingRedux/source/test/renaming_tests/test2/main.om
/branches/RenamingRedux/source/test/renaming_tests/test3
/branches/RenamingRedux/source/test/renaming_tests/test3/accumulating.mod
/branches/RenamingRedux/source/test/renaming_tests/test3/accumulating.sig
/branches/RenamingRedux/source/test/renaming_tests/test3/base.sig
/branches/RenamingRedux/source/test/renaming_tests/test3/expected.mod
/branches/RenamingRedux/source/test/renaming_tests/test3/expected.sig
/branches/RenamingRedux/source/test/renaming_tests/test3/main.om
Deleted:
/branches/RenamingRedux/source/test/compiler_tests/test38
/branches/RenamingRedux/source/test/compiler_tests/test39
/branches/RenamingRedux/source/test/compiler_tests/test40
Modified:
/branches/RenamingRedux/source/OMakefile
/branches/RenamingRedux/source/test/OMakefile

=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/OMakefile Tue Jan 27
07:15:08 2015 UTC
@@ -0,0 +1,25 @@
+SUBDIRS = $(glob D, *)
+
+.SUBDIRS: $(SUBDIRS)
+ # The default main file is the name of the test directory
+ MAIN = $(basename $(absname $(CWD)))
+
+ # Here, main.om is expected to contain a line:
+ # 1) 'MAIN = x,y,..', a list of files specified to be equivalent
+ # to the 'expected' module
+ if $(file-exists main.om)
+ include main.om
+ export
+
+ # This diff ignores the names of the modules
+ RENAMING-DIFF = $(DIFF) --ignore-matching-lines='^Module\|Disassem'
+
+ FILES = $(rootname $(glob *.mod))
+
+ %.dis: %.lpo $(TJDIS)
+ $(TJDIS) $< >$@
+
+ .PHONY: compiler-renaming-test
+ compiler-renaming-test: $(TJDIS) expected.dis $(addsuffix .dis,
$(MAIN))
+ foreach(file, $(MAIN))
+ $(RENAMING-DIFF) expected.dis $(file).dis
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test1/base.sig Tue
Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,5 @@
+sig base.
+
+kind a type.
+
+type x int.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test1/expected.mod
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+module expected.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test1/expected.sig
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,5 @@
+sig expected.
+
+kind a type.
+
+type x int.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test1/include.mod
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+module include.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test1/include.sig
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,3 @@
+sig include.
+
+accum_sig base {kind a, type x}.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test1/main.om Tue
Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+MAIN = include renametoself
=======================================
--- /dev/null
+++
/branches/RenamingRedux/source/test/renaming_tests/test1/renametoself.mod
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+module renametoself.
=======================================
--- /dev/null
+++
/branches/RenamingRedux/source/test/renaming_tests/test1/renametoself.sig
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,3 @@
+sig renametoself.
+
+accum_sig base {kind a => a, type x => x}.
=======================================
--- /dev/null
+++
/branches/RenamingRedux/source/test/renaming_tests/test2/accumulating.mod
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+module accumulating.
=======================================
--- /dev/null
+++
/branches/RenamingRedux/source/test/renaming_tests/test2/accumulating.sig
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,3 @@
+sig accumulating.
+
+accum_sig base {*}.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test2/base.sig Tue
Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,5 @@
+sig base.
+
+kind a type.
+
+type x int.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test2/expected.mod
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+module expected.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test2/expected.sig
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,5 @@
+sig expected.
+
+kind a type.
+
+type x int.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test2/main.om Tue
Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+MAIN = accumulating
=======================================
--- /dev/null
+++
/branches/RenamingRedux/source/test/renaming_tests/test3/accumulating.mod
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+module accumulating.
=======================================
--- /dev/null
+++
/branches/RenamingRedux/source/test/renaming_tests/test3/accumulating.sig
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,3 @@
+sig accumulating.
+
+accum_sig base {kind a => b, type x => y}.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test3/base.sig Tue
Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,5 @@
+sig base.
+
+kind a type.
+
+type x int.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test3/expected.mod
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+module expected.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test3/expected.sig
Tue Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,5 @@
+sig expected.
+
+kind b type.
+
+type y int.
=======================================
--- /dev/null
+++ /branches/RenamingRedux/source/test/renaming_tests/test3/main.om Tue
Jan 27 07:15:08 2015 UTC
@@ -0,0 +1,1 @@
+MAIN = accumulating
=======================================
--- /branches/RenamingRedux/source/OMakefile Mon Dec 29 20:36:31 2014 UTC
+++ /branches/RenamingRedux/source/OMakefile Tue Jan 27 07:15:08 2015 UTC
@@ -312,4 +312,5 @@
.SUBDIRS: $(TST)

.PHONY: test
-test: compiler-test compiler-negative-test linker-test system-test
+test: compiler-test compiler-negative-test linker-test system-test \
+ compiler-renaming-test
=======================================
--- /branches/RenamingRedux/source/test/OMakefile Wed Aug 21 13:50:02 2013
UTC
+++ /branches/RenamingRedux/source/test/OMakefile Tue Jan 27 07:15:08 2015
UTC
@@ -25,5 +25,6 @@
# Subdirectories
#

-.SUBDIRS: linker_tests compiler_tests compiler_negative_tests system_tests
+.SUBDIRS: linker_tests compiler_tests compiler_negative_tests \
+ system_tests renaming_tests