Skip to content

Commit 92cd2d7

Browse files
t-bt-b
authored
Merge pull request #2415 from AllenInstitute/bugfix/2415-make-compilation-tests-faster
Make compilation tests faster
2 parents c6237bb + 487192e commit 92cd2d7

16 files changed

+608
-824
lines changed

‎Packages/tests/Basic/UTF_Basic.ipf‎

Lines changed: 1 addition & 189 deletions
Original file line numberDiff line numberDiff line change
@@ -3,195 +3,7 @@
33
#pragma rtFunctionErrors=1
44
#pragma ModuleName=Basic
55

6-
#include "UTF_HelperFunctions"
7-
8-
// keep sorted
9-
#include "UTF_Amplifier"
10-
#include "UTF_AnalysisBrowserTest"
11-
#include "UTF_AnalysisFunctionHelpers"
12-
#include "UTF_AnalysisFunctionParameters"
13-
#include "UTF_AnalysisFunctionPrototypes"
14-
#include "UTF_AsynFrameworkTest"
15-
#include "UTF_Configuration"
16-
#include "UTF_DAEphyswoHardware"
17-
#include "UTF_Debugging"
18-
#include "UTF_EpochswoHardware"
19-
#include "UTF_ForeignFunctionInterface"
20-
#include "UTF_GuiUtilities"
21-
#include "UTF_JSONWaveNotes"
22-
#include "UTF_Labnotebook"
23-
#include "UTF_Macros"
24-
#include "UTF_oodDAQ"
25-
#include "UTF_PGCSetAndActivateControl"
26-
#include "UTF_StimsetAPI"
27-
#include "UTF_SweepFormula"
28-
#include "UTF_SweepFormula_Operations"
29-
#include "UTF_SweepFormula_PSX"
30-
#include "UTF_Testpulse"
31-
#include "UTF_ThreadsafeDataSharing"
32-
#include "UTF_TraceUserData"
33-
#include "UTF_UpgradeDataFolderLocation"
34-
#include "UTF_UpgradeWaveLocationAndGetIt"
35-
#include "UTF_Utils_Algorithm"
36-
#include "UTF_Utils_Checks"
37-
#include "UTF_Utils_Conversions"
38-
#include "UTF_Utils_DataFolder"
39-
#include "UTF_Utils_File"
40-
#include "UTF_Utils_GUI"
41-
#include "UTF_Utils_List"
42-
#include "UTF_Utils_Mies_Algorithm"
43-
#include "UTF_Utils_Mies_BackupWaves"
44-
#include "UTF_Utils_Mies_Config"
45-
#include "UTF_Utils_Mies_Logging"
46-
#include "UTF_Utils_Mies_Sweep"
47-
#include "UTF_Utils_Numeric"
48-
#include "UTF_Utils_ProgramFlow"
49-
#include "UTF_Utils_Strings"
50-
#include "UTF_Utils_Settings"
51-
#include "UTF_Utils_System"
52-
#include "UTF_Utils_Time"
53-
#include "UTF_Utils_WaveHandling"
54-
#include "UTF_UtilsChecks"
55-
#include "UTF_WaveAveraging"
56-
#include "UTF_WaveBuilder"
57-
#include "UTF_WaveBuilderRegression"
58-
#include "UTF_WaveVersioning"
59-
#include "UTF_XOPsCompilation"
60-
#include "UTF_ZeroMQPublishing"
61-
62-
// include examples here so that these are compile tested as well
63-
#include "example-stimulus-set-api"
64-
65-
// Entry point for UTF
66-
Function run()
67-
68-
return RunWithOpts(instru = DoInstrumentation())
69-
End
70-
71-
// Examples:
72-
// - RunWithOpts()
73-
// - RunWithOpts(testsuite = "UTF_Configuration.ipf")
74-
// - RunWithOpts(testcase = "TestFindLevel")
75-
Function RunWithOpts([string testcase, string testsuite, variable allowdebug, variable instru, string traceWinList, variable keepDataFolder, variable enableJU, variable enableRegExp])
76-
77-
variable debugMode
78-
string traceOptions
79-
string list = ""
80-
string name = GetTestName()
81-
variable waveTrackingMode = GetWaveTrackingMode()
82-
83-
// speeds up testing to start with a fresh copy
84-
KillWindow/Z HistoryCarbonCopy
85-
86-
if(ParamIsDefault(allowdebug))
87-
debugMode = 0
88-
else
89-
debugMode = IUTF_DEBUG_FAILED_ASSERTION | IUTF_DEBUG_ENABLE | IUTF_DEBUG_ON_ERROR | IUTF_DEBUG_NVAR_SVAR_WAVE
90-
endif
91-
92-
if(ParamIsDefault(testcase))
93-
testcase = ""
94-
endif
95-
96-
if(ParamIsDefault(instru))
97-
instru = 0
98-
else
99-
instru = !!instru
100-
endif
101-
102-
if(ParamIsDefault(enableJU))
103-
enableJU = IsRunningInCI()
104-
else
105-
enableJU = !!enableJU
106-
endif
107-
108-
if(ParamIsDefault(traceWinList))
109-
traceWinList = "MIES_.*\.ipf"
110-
endif
111-
112-
if(ParamIsDefault(keepDataFolder))
113-
keepDataFolder = 0
114-
else
115-
keepDataFolder = !!keepDataFolder
116-
endif
117-
118-
if(ParamIsDefault(enableRegExp))
119-
enableRegExp = 0
120-
else
121-
enableRegExp = !!enableRegExp
122-
endif
123-
124-
if(!instru)
125-
traceWinList = ""
126-
endif
127-
128-
traceOptions = GetDefaultTraceOptions()
129-
130-
// sorted list
131-
list = AddListItem("UTF_Amplifier.ipf", list, ";", Inf)
132-
list = AddListItem("UTF_AnalysisBrowserTest.ipf", list, ";", Inf)
133-
list = AddListItem("UTF_AnalysisFunctionHelpers.ipf", list, ";", Inf)
134-
list = AddListItem("UTF_AnalysisFunctionParameters.ipf", list, ";", Inf)
135-
list = AddListItem("UTF_AnalysisFunctionPrototypes.ipf", list, ";", Inf)
136-
list = AddListItem("UTF_AsynFrameworkTest.ipf", list, ";", Inf)
137-
list = AddListItem("UTF_Debugging.ipf", list, ";", Inf)
138-
list = AddListItem("UTF_Configuration.ipf", list, ";", Inf)
139-
list = AddListItem("UTF_DAEphyswoHardware.ipf", list, ";", Inf)
140-
list = AddListItem("UTF_EpochswoHardware.ipf", list, ";", Inf)
141-
list = AddListItem("UTF_ForeignFunctionInterface.ipf", list, ";", Inf)
142-
list = AddListItem("UTF_GuiUtilities.ipf", list, ";", Inf)
143-
list = AddListItem("UTF_JSONWaveNotes.ipf", list, ";", Inf)
144-
list = AddListItem("UTF_Labnotebook.ipf", list, ";", Inf)
145-
list = AddListItem("UTF_Macros.ipf", list, ";", Inf)
146-
list = AddListItem("UTF_oodDAQ.ipf", list, ";", Inf)
147-
list = AddListItem("UTF_PGCSetAndActivateControl.ipf", list, ";", Inf)
148-
list = AddListItem("UTF_StimsetAPI.ipf", list, ";", Inf)
149-
list = AddListItem("UTF_SweepFormula.ipf", list, ";", Inf)
150-
list = AddListItem("UTF_SweepFormula_Operations.ipf", list, ";", Inf)
151-
list = AddListItem("UTF_SweepFormula_PSX.ipf", list, ";", Inf)
152-
list = AddListItem("UTF_Testpulse.ipf", list, ";", Inf)
153-
list = AddListItem("UTF_TraceUserData.ipf", list, ";", Inf)
154-
list = AddListItem("UTF_ThreadsafeDataSharing.ipf", list, ";", Inf)
155-
list = AddListItem("UTF_UpgradeDataFolderLocation.ipf", list, ";", Inf)
156-
list = AddListItem("UTF_UpgradeWaveLocationAndGetIt.ipf", list, ";", Inf)
157-
list = AddListItem("UTF_Utils_Algorithm.ipf", list, ";", Inf)
158-
list = AddListItem("UTF_Utils_Checks.ipf", list, ";", Inf)
159-
list = AddListItem("UTF_Utils_Conversions.ipf", list, ";", Inf)
160-
list = AddListItem("UTF_Utils_DataFolder.ipf", list, ";", Inf)
161-
list = AddListItem("UTF_Utils_File.ipf", list, ";", Inf)
162-
list = AddListItem("UTF_Utils_GUI.ipf", list, ";", Inf)
163-
list = AddListItem("UTF_Utils_List.ipf", list, ";", Inf)
164-
list = AddListItem("UTF_Utils_Mies_Algorithm.ipf", list, ";", Inf)
165-
list = AddListItem("UTF_Utils_Mies_BackupWaves.ipf", list, ";", Inf)
166-
list = AddListItem("UTF_Utils_Mies_Config.ipf", list, ";", Inf)
167-
list = AddListItem("UTF_Utils_Mies_Logging.ipf", list, ";", Inf)
168-
list = AddListItem("UTF_Utils_Mies_Sweep.ipf", list, ";", Inf)
169-
list = AddListItem("UTF_Utils_Numeric.ipf", list, ";", Inf)
170-
list = AddListItem("UTF_Utils_ProgramFlow.ipf", list, ";", Inf)
171-
list = AddListItem("UTF_Utils_Strings.ipf", list, ";", Inf)
172-
list = AddListItem("UTF_Utils_Settings.ipf", list, ";", Inf)
173-
list = AddListItem("UTF_Utils_System.ipf", list, ";", Inf)
174-
list = AddListItem("UTF_Utils_Time.ipf", list, ";", Inf)
175-
list = AddListItem("UTF_Utils_WaveHandling.ipf", list, ";", Inf)
176-
list = AddListItem("UTF_UtilsChecks.ipf", list, ";", Inf)
177-
list = AddListItem("UTF_WaveAveraging.ipf", list, ";", Inf)
178-
list = AddListItem("UTF_WaveBuilder.ipf", list, ";", Inf)
179-
list = AddListItem("UTF_WaveBuilderRegression.ipf", list, ";", Inf)
180-
list = AddListItem("UTF_WaveVersioning.ipf", list, ";", Inf)
181-
list = AddListItem("UTF_ZeroMQPublishing.ipf", list, ";", Inf)
182-
183-
if(ParamIsDefault(testsuite))
184-
testsuite = list
185-
else
186-
// do nothing
187-
endif
188-
189-
if(IsEmpty(testcase))
190-
RunTest(testsuite, name = name, enableJU = enableJU, enableRegExp = enableRegExp, debugMode = debugMode, traceOptions = traceOptions, traceWinList = traceWinList, keepDataFolder = keepDataFolder, waveTrackingMode = waveTrackingMode)
191-
else
192-
RunTest(testsuite, name = name, enableJU = enableJU, enableRegExp = enableRegExp, debugMode = debugMode, testcase = testcase, traceOptions = traceOptions, traceWinList = traceWinList, keepDataFolder = keepDataFolder, waveTrackingMode = waveTrackingMode)
193-
endif
194-
End
6+
#include "UTF_Basic_includes"
1957

1968
Function TEST_BEGIN_OVERRIDE(string name)
1979

‎Packages/tests/Basic/UTF_Basic_Includes.ipf‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#pragma TextEncoding="UTF-8"
2+
#pragma rtGlobals=3 // Use modern global access method and strict wave access.
3+
#pragma rtFunctionErrors=1
4+
#pragma ModuleName=BasicIncludes
5+
6+
#include "UTF_HelperFunctions"
7+
8+
// keep sorted
9+
#include "UTF_Amplifier"
10+
#include "UTF_AnalysisBrowserTest"
11+
#include "UTF_AnalysisFunctionHelpers"
12+
#include "UTF_AnalysisFunctionParameters"
13+
#include "UTF_AnalysisFunctionPrototypes"
14+
#include "UTF_AsynFrameworkTest"
15+
#include "UTF_Configuration"
16+
#include "UTF_DAEphyswoHardware"
17+
#include "UTF_Debugging"
18+
#include "UTF_EpochswoHardware"
19+
#include "UTF_ForeignFunctionInterface"
20+
#include "UTF_GuiUtilities"
21+
#include "UTF_JSONWaveNotes"
22+
#include "UTF_Labnotebook"
23+
#include "UTF_Macros"
24+
#include "UTF_oodDAQ"
25+
#include "UTF_PGCSetAndActivateControl"
26+
#include "UTF_StimsetAPI"
27+
#include "UTF_SweepFormula"
28+
#include "UTF_SweepFormula_Operations"
29+
#include "UTF_SweepFormula_PSX"
30+
#include "UTF_Testpulse"
31+
#include "UTF_ThreadsafeDataSharing"
32+
#include "UTF_TraceUserData"
33+
#include "UTF_UpgradeDataFolderLocation"
34+
#include "UTF_UpgradeWaveLocationAndGetIt"
35+
#include "UTF_Utils_Algorithm"
36+
#include "UTF_Utils_Checks"
37+
#include "UTF_Utils_Conversions"
38+
#include "UTF_Utils_DataFolder"
39+
#include "UTF_Utils_File"
40+
#include "UTF_Utils_GUI"
41+
#include "UTF_Utils_List"
42+
#include "UTF_Utils_Mies_Algorithm"
43+
#include "UTF_Utils_Mies_BackupWaves"
44+
#include "UTF_Utils_Mies_Config"
45+
#include "UTF_Utils_Mies_Logging"
46+
#include "UTF_Utils_Mies_Sweep"
47+
#include "UTF_Utils_Numeric"
48+
#include "UTF_Utils_ProgramFlow"
49+
#include "UTF_Utils_Strings"
50+
#include "UTF_Utils_Settings"
51+
#include "UTF_Utils_System"
52+
#include "UTF_Utils_Time"
53+
#include "UTF_Utils_WaveHandling"
54+
#include "UTF_UtilsChecks"
55+
#include "UTF_WaveAveraging"
56+
#include "UTF_WaveBuilder"
57+
#include "UTF_WaveBuilderRegression"
58+
#include "UTF_WaveVersioning"
59+
#include "UTF_XOPsCompilation"
60+
#include "UTF_ZeroMQPublishing"
61+
62+
// include examples here so that these are compile tested as well
63+
#include "example-stimulus-set-api"

‎Packages/tests/Compilation/CompilationTester.ipf‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ End
4040
Function/WAVE GetIncludes()
4141

4242
// keep sorted
43-
Make/FREE/T includes = {"MIES_Include", \
44-
"UTF_Basic", \
45-
"UTF_PAPlot", \
46-
"UTF_HardwareAnalysisFunctions", \
47-
"UTF_HardwareBasic"}
43+
Make/FREE/T includes = {"UTF_All_Includes"}
4844

4945
SetDimensionLabelsFromWaveContents(includes)
5046

0 commit comments

Comments
 (0)