summaryrefslogtreecommitdiff
path: root/cesar/test_general
diff options
context:
space:
mode:
authorNélio Laranjeiro2012-10-26 14:11:27 +0200
committerNélio Laranjeiro2012-11-29 17:32:09 +0100
commit230a0a43df5a2c2616f0225247b12b12680612bc (patch)
treec7ce0062dbdf97729452a87d697176564f051abd /cesar/test_general
parentf26a0c498c17173f60ff576875ed1b5ffa89c908 (diff)
cesar/test_general/station/compliance: remove board compilation
Diffstat (limited to 'cesar/test_general')
-rw-r--r--cesar/test_general/station/compliance/Config (renamed from cesar/test_general/station/compliance/simu-Config)0
-rw-r--r--cesar/test_general/station/compliance/Makefile23
-rw-r--r--cesar/test_general/station/compliance/Makefile.mk10
-rw-r--r--cesar/test_general/station/compliance/board-Config8
-rw-r--r--cesar/test_general/station/compliance/board-Makefile8
-rw-r--r--cesar/test_general/station/compliance/board-ecos.ecc.sh5
-rw-r--r--cesar/test_general/station/compliance/ecos.ecc.sh (renamed from cesar/test_general/station/compliance/simu-ecos.ecc.sh)0
-rw-r--r--cesar/test_general/station/compliance/py/sc01_dut_as_a_cco.py2
-rw-r--r--cesar/test_general/station/compliance/simu-Makefile5
9 files changed, 10 insertions, 51 deletions
diff --git a/cesar/test_general/station/compliance/simu-Config b/cesar/test_general/station/compliance/Config
index 4e326a22b6..4e326a22b6 100644
--- a/cesar/test_general/station/compliance/simu-Config
+++ b/cesar/test_general/station/compliance/Config
diff --git a/cesar/test_general/station/compliance/Makefile b/cesar/test_general/station/compliance/Makefile
index aa9b783b71..5cdeb48d0c 100644
--- a/cesar/test_general/station/compliance/Makefile
+++ b/cesar/test_general/station/compliance/Makefile
@@ -1,17 +1,12 @@
-all: simu board
+BASE = ../../..
+ECOS = y
-clean: simu-clean board-clean
+TARGET_PROGRAMS= station
-simu: simu-Makefile simu-ecos.ecc.sh
- make -f simu-Makefile
+station_SOURCES =
+station_MODULES = lib mac/common mac cl interface cp hal station \
+ host ce cp/av bsu bufmgr \
+ test_general/station/fcall \
+ test_general/station/common
-simu-clean: simu-Makefile
- make -f simu-Makefile clean
-
- make -f simu-Makefile clean
-
-board: board-Makefile board-ecos.ecc.sh
- make -f board-Makefile
-
-board-clean: board-Makefile
- make -f board-Makefile clean
+include $(BASE)/common/make/top.mk
diff --git a/cesar/test_general/station/compliance/Makefile.mk b/cesar/test_general/station/compliance/Makefile.mk
deleted file mode 100644
index 1697afda62..0000000000
--- a/cesar/test_general/station/compliance/Makefile.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-TARGET_PROGRAMS= station
-
-station_SOURCES =
-station_MODULES = lib mac/common mac cl interface cp hal station \
- host ce cp/av bsu bufmgr \
- test_general/station/fcall \
- test_general/station/common \
- $(BOARD_MODULES)
-
-include $(BASE)/common/make/top.mk
diff --git a/cesar/test_general/station/compliance/board-Config b/cesar/test_general/station/compliance/board-Config
deleted file mode 100644
index ed95e6ff04..0000000000
--- a/cesar/test_general/station/compliance/board-Config
+++ /dev/null
@@ -1,8 +0,0 @@
-set plc
-set plc-board
-
-# Debug only.
-CONFIG_TRACE_ON_FATAL = n
-CONFIG_TRACE = n
-CONFIG_DEBUG_CLAIM = n
-CONFIG_LEON_FATAL_BUTTON = n
diff --git a/cesar/test_general/station/compliance/board-Makefile b/cesar/test_general/station/compliance/board-Makefile
deleted file mode 100644
index 8ff981da24..0000000000
--- a/cesar/test_general/station/compliance/board-Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-BASE = ../../..
-ECOS = y
-TARGET = sparc
-VARIANT = board
-TARGET_OPTIMIZE = -Os
-BOARD_MODULES=
-
-include Makefile.mk
diff --git a/cesar/test_general/station/compliance/board-ecos.ecc.sh b/cesar/test_general/station/compliance/board-ecos.ecc.sh
deleted file mode 100644
index db2208c6cc..0000000000
--- a/cesar/test_general/station/compliance/board-ecos.ecc.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-config=${1:-ecos-gen.ecc}
-ecosconfig --config=$config new sparc_leon default
-cat >> $config <<'EOF'
-EOF
-ecosconfig --config=$config check
diff --git a/cesar/test_general/station/compliance/simu-ecos.ecc.sh b/cesar/test_general/station/compliance/ecos.ecc.sh
index e0278271fe..e0278271fe 100644
--- a/cesar/test_general/station/compliance/simu-ecos.ecc.sh
+++ b/cesar/test_general/station/compliance/ecos.ecc.sh
diff --git a/cesar/test_general/station/compliance/py/sc01_dut_as_a_cco.py b/cesar/test_general/station/compliance/py/sc01_dut_as_a_cco.py
index 3f001f606a..829752c42d 100644
--- a/cesar/test_general/station/compliance/py/sc01_dut_as_a_cco.py
+++ b/cesar/test_general/station/compliance/py/sc01_dut_as_a_cco.py
@@ -22,7 +22,7 @@ sys.path.append (base_path + '/test_general/station/common/py')
from startup import Startup
startup = Startup (base_path = base_path,
- executable = sys.path[0] + '/../obj/simu/station.elf')
+ executable = sys.path[0] + '/../obj/station.elf')
startup.add_option ('-g', '--gdb', action = 'store_true',
default = False, help = 'launch the test in debug mode')
startup.add_option ('-t', '--trace', action = 'store_true',
diff --git a/cesar/test_general/station/compliance/simu-Makefile b/cesar/test_general/station/compliance/simu-Makefile
deleted file mode 100644
index 95c553294d..0000000000
--- a/cesar/test_general/station/compliance/simu-Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-BASE = ../../..
-ECOS = y
-VARIANT = simu
-
-include Makefile.mk