Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[324] trunk
|
From: <got...@us...> - 2009-09-12 11:02:16
|
Revision: 324
http://scstudio.svn.sourceforge.net/scstudio/?rev=324&view=rev
Author: gotthardp
Date: 2009-09-12 11:02:05 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
New tests integrated into the ctest environment.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/tests/CMakeLists.txt
trunk/tests/z120_test/CMakeLists.txt
Added Paths:
-----------
trunk/doc/CMakeLists.txt
trunk/tests/acyclic/CMakeLists.txt
trunk/tests/fifo/CMakeLists.txt
trunk/tests/local_choice/CMakeLists.txt
Removed Paths:
-------------
trunk/doc/Makefile
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2009-09-12 09:07:28 UTC (rev 323)
+++ trunk/CMakeLists.txt 2009-09-12 11:02:05 UTC (rev 324)
@@ -39,6 +39,7 @@
SET(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})
ENDIF(WIN32)
+ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(tests)
Added: trunk/doc/CMakeLists.txt
===================================================================
--- trunk/doc/CMakeLists.txt (rev 0)
+++ trunk/doc/CMakeLists.txt 2009-09-12 11:02:05 UTC (rev 324)
@@ -0,0 +1,18 @@
+FIND_PACKAGE(LATEX)
+
+MACRO(ADD_PDFLATEX_DOCUMENT FILE)
+ ADD_CUSTOM_TARGET(${FILE} ALL
+ DEPENDS ${FILE}.pdf
+ )
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${FILE}.pdf
+ COMMAND ${PDFLATEX_COMPILER} ${FILE}.tex
+ DEPENDS ${FILE}.tex
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+ENDMACRO(ADD_PDFLATEX_DOCUMENT)
+
+IF(PDFLATEX_COMPILER)
+ ADD_PDFLATEX_DOCUMENT(beautify)
+ ADD_PDFLATEX_DOCUMENT(memb_alg)
+ENDIF(PDFLATEX_COMPILER)
Property changes on: trunk/doc/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Deleted: trunk/doc/Makefile
===================================================================
--- trunk/doc/Makefile 2009-09-12 09:07:28 UTC (rev 323)
+++ trunk/doc/Makefile 2009-09-12 11:02:05 UTC (rev 324)
@@ -1,9 +0,0 @@
-# $Id: Makefile,v 1.3 2008/10/09 08:07:40 xrehak Exp $
-all: memb_alg.pdf beautify.pdf
-
-%.pdf: %.tex algorithmic.sty algorithm.sty
- pdflatex $<
- pdflatex $<
-
-clean:
- rm -rf *.dvi *.log *.aux *.out
Modified: trunk/tests/CMakeLists.txt
===================================================================
--- trunk/tests/CMakeLists.txt 2009-09-12 09:07:28 UTC (rev 323)
+++ trunk/tests/CMakeLists.txt 2009-09-12 11:02:05 UTC (rev 324)
@@ -91,6 +91,7 @@
scZ120
${CMAKE_DL_LIBS}
)
+GET_TARGET_PROPERTY(CHECKER_TEST_EXECUTABLE checker_test LOCATION)
SET(CHECKER_SEQUENCE 0)
MACRO(ADD_CHECKER_TEST LIBRARY PROPERTY FILE SATISFIED)
@@ -99,14 +100,14 @@
# depending on the generator being used with the test-time variable.
STRING(REGEX REPLACE "\\$\\(.*\\)" "\${CTEST_CONFIGURATION_TYPE}"
LIBRARY_LOCATION "${LIBRARY_LOCATION}")
- ADD_TEST("checker_test-${CHECKER_SEQUENCE}-${LIBRARY}"
- ${EXECUTABLE_OUTPUT_PATH}/checker_test ${LIBRARY_LOCATION} ${PROPERTY} ${FILE} ${SATISFIED})
+ ADD_TEST("checker_test-${CHECKER_SEQUENCE}-${FILE}"
+ ${CHECKER_TEST_EXECUTABLE} ${LIBRARY_LOCATION} ${PROPERTY} ${FILE} ${SATISFIED})
MATH(EXPR CHECKER_SEQUENCE ${CHECKER_SEQUENCE}+1)
ENDMACRO(ADD_CHECKER_TEST)
-ADD_CHECKER_TEST(scorder "FIFO" z120_test00.mpr 1)
-ADD_CHECKER_TEST(scorder "Acyclic" z120_test00.mpr 1)
-ADD_CHECKER_TEST(scrace "Race Free" z120_test00.mpr 0)
+ADD_SUBDIRECTORY(acyclic)
+ADD_SUBDIRECTORY(fifo)
+ADD_SUBDIRECTORY(local_choice)
ENDIF(ANTLR_FOUND)
Added: trunk/tests/acyclic/CMakeLists.txt
===================================================================
--- trunk/tests/acyclic/CMakeLists.txt (rev 0)
+++ trunk/tests/acyclic/CMakeLists.txt 2009-09-12 11:02:05 UTC (rev 324)
@@ -0,0 +1,12 @@
+# Positive test-cases
+ADD_CHECKER_TEST(scorder "Acyclic" acyclic1.mpr 1)
+ADD_CHECKER_TEST(scorder "Acyclic" acyclic2.mpr 1)
+ADD_CHECKER_TEST(scorder "Acyclic" acyclic3.mpr 1)
+ADD_CHECKER_TEST(scorder "Acyclic" acyclic4.mpr 1)
+ADD_CHECKER_TEST(scorder "Acyclic" acyclic5.mpr 1)
+ADD_CHECKER_TEST(scorder "Acyclic" acyclic6.mpr 1)
+# Negative test-cases
+ADD_CHECKER_TEST(scorder "Acyclic" cyclic1.mpr 0)
+ADD_CHECKER_TEST(scorder "Acyclic" cyclic2.mpr 0)
+ADD_CHECKER_TEST(scorder "Acyclic" cyclic3.mpr 0)
+ADD_CHECKER_TEST(scorder "Acyclic" cyclic4.mpr 0)
Property changes on: trunk/tests/acyclic/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/tests/fifo/CMakeLists.txt
===================================================================
--- trunk/tests/fifo/CMakeLists.txt (rev 0)
+++ trunk/tests/fifo/CMakeLists.txt 2009-09-12 11:02:05 UTC (rev 324)
@@ -0,0 +1,11 @@
+# Positive test-cases
+ADD_CHECKER_TEST(scorder "FIFO" fifo1.mpr 1)
+ADD_CHECKER_TEST(scorder "FIFO" fifo2.mpr 1)
+ADD_CHECKER_TEST(scorder "FIFO" fifo3.mpr 1)
+ADD_CHECKER_TEST(scorder "FIFO" fifo4.mpr 1)
+ADD_CHECKER_TEST(scorder "FIFO" fifo5.mpr 1)
+ADD_CHECKER_TEST(scorder "FIFO" fifo6.mpr 1)
+ADD_CHECKER_TEST(scorder "FIFO" fifo7.mpr 1)
+# Negative test-cases
+ADD_CHECKER_TEST(scorder "FIFO" nonfifo1.mpr 0)
+ADD_CHECKER_TEST(scorder "FIFO" nonfifo2.mpr 0)
Property changes on: trunk/tests/fifo/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/tests/local_choice/CMakeLists.txt
===================================================================
--- trunk/tests/local_choice/CMakeLists.txt (rev 0)
+++ trunk/tests/local_choice/CMakeLists.txt 2009-09-12 11:02:05 UTC (rev 324)
@@ -0,0 +1,10 @@
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" hard1_nonlocal.mpr 0)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" hard2_nonlocal.mpr 0)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" hard3_local.mpr 1)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" medium1_nonlocal.mpr 0)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" medium2_nonlocal.mpr 0)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" medium3_local.mpr 1)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" simple2_nonlocal.mpr 0)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" simple3_nonlocal.mpr 0)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" simple_local.mpr 1)
+ADD_CHECKER_TEST(sclocalchoice "Local Choice" simple_nonlocal.mpr 0)
Property changes on: trunk/tests/local_choice/CMakeLists.txt
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: trunk/tests/z120_test/CMakeLists.txt
===================================================================
--- trunk/tests/z120_test/CMakeLists.txt 2009-09-12 09:07:28 UTC (rev 323)
+++ trunk/tests/z120_test/CMakeLists.txt 2009-09-12 11:02:05 UTC (rev 324)
@@ -7,7 +7,7 @@
SET(Z120_SEQUENCE 0)
MACRO(ADD_Z120_TEST FILE SATISFIED)
- ADD_TEST("z120_test-${Z120_SEQUENCE}"
+ ADD_TEST("z120_test-${Z120_SEQUENCE}-${FILE}"
${EXECUTABLE_OUTPUT_PATH}/z120_diff.py ${FILE} ${SATISFIED})
MATH(EXPR Z120_SEQUENCE ${Z120_SEQUENCE}+1)
ENDMACRO(ADD_Z120_TEST)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
