Skip to content

Commit 5d794b4

Browse files
Further CI migration updates
1 parent c622473 commit 5d794b4

File tree

5 files changed

+6
-34
lines changed

5 files changed

+6
-34
lines changed

CI/scripts/genTlbx.m

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -66,36 +66,6 @@ function genTlbx(examples)
6666
end
6767
matlab.addons.toolbox.packageToolbox(projectFile,outputFile)
6868

69-
if ~usejava('desktop')
70-
%% Update toolbox paths
71-
mkdir other
72-
movefile([outputFile,'.mltbx'], ['other/',outputFile,'.zip']);
73-
cd other
74-
unzip([outputFile,'.zip'],'out');
75-
cd('out')
76-
cd('metadata');
77-
fid = fopen('configuration.xml','r');
78-
f=fread(fid,'*char')';
79-
fclose(fid);
80-
81-
s = '</matlabPaths>';
82-
sections = strsplit(f,s);
83-
s1 = sections{1};
84-
s2 = sections{2};
85-
newfile = [s1,paths,s,s2];
86-
87-
fid = fopen('configuration.xml','w');
88-
fprintf(fid,'%s',newfile);
89-
fclose(fid);
90-
91-
%% Repack
92-
cd('..');
93-
zip([outputFile,'.zip'], '*');
94-
movefile([outputFile,'.zip'],['../../',outputFile,'.mltbx']);
95-
cd('../..');
96-
rmdir('other','s');
97-
end
98-
9969
delete bsp.prj
10070

10171

test/BSPInstallerTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
methods(TestClassSetup)
77
function removeinstalledbsp(~)
8-
str = 'Analog Devices';
8+
str = 'Analog Devices Board Support Packages';
99
ts = matlab.addons.toolbox.installedToolboxes;
1010
for t = ts
1111
if contains(t.Name,str)

test/BSPTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
methods(TestClassSetup)
44
function removeinstalledbsp(~)
5-
str = 'Analog Devices';
5+
str = 'Analog Devices Board Support Packages';
66
ts = matlab.addons.toolbox.installedToolboxes;
77
for t = ts
88
if contains(t.Name,str)

test/build_design.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969

7070
%% Run the workflow
7171
try
72-
hdlcoder.runWorkflow([mdl,'/HDL_DUT'], hWC, 'Verbosity', 'On');
72+
hdlcoder.runWorkflow([mdl,'/HDL_DUT'], hWC, 'Verbosity', 'on');
73+
fprintf('Build finished without exception\n');
7374
close_system(mdl, false);
7475
bdclose('all');
7576
bootbin = [folder,'/vivado_ip_prj/boot/BOOT.BIN'];
@@ -82,6 +83,7 @@
8283
end
8384
out = [];
8485
catch ME
86+
fprintf('Exception occurred with message: %s\n', ME.message);
8587
if SynthesizeDesign && exist([folder,'/vivado_ip_prj/boot/BOOT.BIN'],'file')
8688
ME = [];
8789
end

test/runTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function runTests(board)
2323

2424
try
2525

26-
runner = matlab.unittest.TestRunner.withTextOutput('OutputDetail',1);
26+
runner = matlab.unittest.TestRunner.withTextOutput('OutputDetail',4);
2727
runner.addPlugin(DiagnosticsValidationPlugin)
2828

2929
xmlFile = 'BSPTestResults.xml';

0 commit comments

Comments
 (0)