Skip to content

Commit 90f731d

Browse files
azonenbergazonenberg
committedOct 30, 2016
tests: Massive restructuring of directories. All non-HiL tests now run during build instead of during test.
1 parent e5e3107 commit 90f731d

22 files changed

+44
-137
lines changed
 

‎tests/greenpak4/Analog.v

-82
This file was deleted.

‎tests/greenpak4/CMakeLists.txt

+1-55
Original file line numberDiff line numberDiff line change
@@ -85,63 +85,9 @@ function(add_greenpak4_bitstream name part)
8585

8686
endfunction()
8787

88-
########################################################################################################################
89-
# Run PAR as a test
90-
91-
function(add_greenpak4_test name part)
92-
add_greenpak4_netlist(${name} ${part})
93-
94-
add_custom_target(testcase-gp4-${name}
95-
ALL
96-
DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${name}.json")
97-
98-
add_test(
99-
NAME "${name}"
100-
COMMAND gp4par "--stdout-only"
101-
--usercode a3
102-
--part ${part}
103-
--output "${CMAKE_CURRENT_BINARY_DIR}/${name}.txt"
104-
--logfile "${CMAKE_CURRENT_BINARY_DIR}/${name}.log"
105-
"${CMAKE_CURRENT_BINARY_DIR}/${name}.json"
106-
"--debug")
107-
endfunction()
108-
109-
########################################################################################################################
110-
# Run all of the PAR-only tests (TODO: set up HiL for these?)
111-
112-
add_greenpak4_test(Bargraph SLG46620V)
113-
add_greenpak4_test(Blinky SLG46620V)
114-
add_greenpak4_test(Dac SLG46620V)
115-
add_greenpak4_test(Delay SLG46620V)
116-
add_greenpak4_test(Ethernet SLG46620V)
117-
add_greenpak4_test(Inverters SLG46620V)
118-
add_greenpak4_test(Location SLG46620V)
119-
add_greenpak4_test(Loop SLG46620V)
120-
add_greenpak4_test(POR SLG46620V)
121-
add_greenpak4_test(Tristate SLG46620V)
122-
add_greenpak4_test(Vector SLG46620V)
123-
124-
# These bitstreams are hard coded in gpdevboard/SocketTest
125-
# but we ship source for standalone HiL test support and verification
126-
add_greenpak4_bitstream(SocketTestLoopback_STQFN14 SLG46140V)
127-
add_greenpak4_bitstream(SocketTestLoopback_STQFN20 SLG46620V)
128-
add_greenpak4_bitstream(SocketTestLoopback_STQFN20D SLG46621V)
129-
130-
########################################################################################################################
131-
# Run all of the HiL tests
132-
133-
add_greenpak4_hiltest(PGA SLG46620V)
134-
135-
########################################################################################################################
136-
# Compile binaries for HiL tests (no install required here)
137-
138-
add_executable(HIL_SocketTestLoopback_SLG46140
139-
HIL_SocketTestLoopback_SLG46140.cpp)
140-
target_link_libraries(HIL_SocketTestLoopback_SLG46140
141-
gpdevboard)
142-
14388
########################################################################################################################
14489
# Add our subdirectories
14590

14691
add_subdirectory(slg46140v)
92+
add_subdirectory(slg46620v)
14793
add_subdirectory(slg46621v)

‎tests/greenpak4/slg46140v/CMakeLists.txt

+11
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,13 @@
1+
########################################################################################################################
2+
# Bitstreams that are not (yet) part of a HiL test
3+
4+
########################################################################################################################
5+
# HiL tests
6+
7+
add_greenpak4_hiltest(SocketTestLoopback_STQFN14 SLG46140V)
8+
9+
########################################################################################################################
10+
# Cosimulation tests (WIP, not yet functional)
11+
112
add_greenpak4_netlist(Cosim_LFOSC SLG46140V)
213
add_sim_netlist(Cosim_LFOSC_TB)

‎tests/greenpak4/Bargraph.v ‎tests/greenpak4/slg46620v/Bargraph.v

File renamed without changes.

‎tests/greenpak4/Blinky.v ‎tests/greenpak4/slg46620v/Blinky.v

File renamed without changes.

‎tests/greenpak4/slg46620v/CMakeLists.txt

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
########################################################################################################################
2+
# Bitstreams that are not (yet) part of a HiL test
3+
4+
add_greenpak4_bitstream(Bargraph SLG46620V)
5+
add_greenpak4_bitstream(Blinky SLG46620V)
6+
add_greenpak4_bitstream(Dac SLG46620V)
7+
add_greenpak4_bitstream(Delay SLG46620V)
8+
add_greenpak4_bitstream(Ethernet SLG46620V)
9+
add_greenpak4_bitstream(Inverters SLG46620V)
10+
add_greenpak4_bitstream(Location SLG46620V)
11+
add_greenpak4_bitstream(Loop SLG46620V)
12+
add_greenpak4_bitstream(POR SLG46620V)
13+
add_greenpak4_bitstream(Tristate SLG46620V)
14+
add_greenpak4_bitstream(Vector SLG46620V)
15+
16+
# Not strictly a HiL test, but we use the (cached) version of this for socket loopback testing
17+
# TODO: have a HiL test that runs this
18+
add_greenpak4_bitstream(SocketTestLoopback_STQFN20 SLG46620V)
19+
20+
########################################################################################################################
21+
# HiL tests
22+
23+
add_greenpak4_hiltest(PGA SLG46620V)

‎tests/greenpak4/Dac.v ‎tests/greenpak4/slg46620v/Dac.v

File renamed without changes.

‎tests/greenpak4/Delay.v ‎tests/greenpak4/slg46620v/Delay.v

File renamed without changes.

‎tests/greenpak4/Ethernet.v ‎tests/greenpak4/slg46620v/Ethernet.v

File renamed without changes.

‎tests/greenpak4/Inverters.v ‎tests/greenpak4/slg46620v/Inverters.v

File renamed without changes.

‎tests/greenpak4/Location.v ‎tests/greenpak4/slg46620v/Location.v

File renamed without changes.

‎tests/greenpak4/Loop.v ‎tests/greenpak4/slg46620v/Loop.v

File renamed without changes.

‎tests/greenpak4/PGA.cpp ‎tests/greenpak4/slg46620v/PGA.cpp

File renamed without changes.

‎tests/greenpak4/PGA.v ‎tests/greenpak4/slg46620v/PGA.v

File renamed without changes.

‎tests/greenpak4/POR.v ‎tests/greenpak4/slg46620v/POR.v

File renamed without changes.

‎tests/greenpak4/Tristate.v ‎tests/greenpak4/slg46620v/Tristate.v

File renamed without changes.

‎tests/greenpak4/Vector.v ‎tests/greenpak4/slg46620v/Vector.v

File renamed without changes.

‎tests/greenpak4/slg46621v/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1+
########################################################################################################################
2+
# Bitstreams that are not (yet) part of a HiL test
3+
4+
# Not strictly a HiL test, but we use the (cached) version of this for distinguishing 46620 from 46621
5+
# TODO: have a HiL test that runs this
16
add_greenpak4_bitstream(PowerRailDetector_STQFN20 SLG46621V)
7+
8+
# Not strictly a HiL test, but we use the (cached) version of this for socket loopback testing
9+
# TODO: have a HiL test that runs this
10+
add_greenpak4_bitstream(SocketTestLoopback_STQFN20D SLG46621V)

0 commit comments

Comments
 (0)
Please sign in to comment.