Skip to content

Commit 45bd4f3

Browse files
author
Oren Cohen
committed
Add SPM code generation test to Travis-CI
1 parent 52822cb commit 45bd4f3

File tree

8 files changed

+92
-86
lines changed

8 files changed

+92
-86
lines changed

‎.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,3 +280,9 @@ matrix:
280280
- echo 'Checking that there is no GPL licence text in code'
281281
- ! git grep -q --ignore-case "gnu general public";
282282
- ! git grep -q --ignore-case "gnu library general public";
283+
- env:
284+
- NAME=psa-autogen
285+
script:
286+
# Run SPM code generator and check that changes are not needed
287+
- python tools/spm/generate_partition_code.py
288+
- git diff --exit-code

‎TESTS/psa/entropy_inject/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include "handles_manager.h"
2727
#include "cmsis.h"
2828
#include "psa_test_its_reset_partition.h"
29-
#include "psa_its_partition.h"
3029
#include "psa_psa_f_partition.h"
30+
#include "psa_its_partition.h"
3131

3232
extern const uint32_t psa_f_external_sids[4];
3333

@@ -44,25 +44,25 @@ spm_partition_t g_partitions[3] = {
4444
.irq_mapper = NULL,
4545
},
4646
{
47-
.partition_id = ITS_ID,
47+
.partition_id = PSA_F_ID,
4848
.thread_id = 0,
49-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
49+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
5050
.flags_interrupts = 0,
5151
.rot_services = NULL,
52-
.rot_services_count = ITS_ROT_SRV_COUNT,
53-
.extern_sids = NULL,
54-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
52+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
53+
.extern_sids = psa_f_external_sids,
54+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
5555
.irq_mapper = NULL,
5656
},
5757
{
58-
.partition_id = PSA_F_ID,
58+
.partition_id = ITS_ID,
5959
.thread_id = 0,
60-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
60+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
6161
.flags_interrupts = 0,
6262
.rot_services = NULL,
63-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
64-
.extern_sids = psa_f_external_sids,
65-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
63+
.rot_services_count = ITS_ROT_SRV_COUNT,
64+
.extern_sids = NULL,
65+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
6666
.irq_mapper = NULL,
6767
},
6868
};
@@ -76,8 +76,8 @@ const uint32_t mem_region_count = 0;
7676

7777
// forward declaration of partition initializers
7878
void test_its_reset_init(spm_partition_t *partition);
79-
void its_init(spm_partition_t *partition);
8079
void psa_f_init(spm_partition_t *partition);
80+
void its_init(spm_partition_t *partition);
8181

8282
uint32_t init_partitions(spm_partition_t **partitions)
8383
{
@@ -86,8 +86,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
8686
}
8787

8888
test_its_reset_init(&(g_partitions[0]));
89-
its_init(&(g_partitions[1]));
90-
psa_f_init(&(g_partitions[2]));
89+
psa_f_init(&(g_partitions[1]));
90+
its_init(&(g_partitions[2]));
9191

9292
*partitions = g_partitions;
9393
return 3;

‎TESTS/psa/prot_internal_storage/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "handles_manager.h"
2929
#include "cmsis.h"
3030
#include "psa_test_its_reset_partition.h"
31-
#include "psa_its_partition.h"
3231
#include "psa_psa_f_partition.h"
32+
#include "psa_its_partition.h"
3333

3434
extern const uint32_t psa_f_external_sids[4];
3535

@@ -46,25 +46,25 @@ spm_partition_t g_partitions[3] = {
4646
.irq_mapper = NULL,
4747
},
4848
{
49-
.partition_id = ITS_ID,
49+
.partition_id = PSA_F_ID,
5050
.thread_id = 0,
51-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
51+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
5252
.flags_interrupts = 0,
5353
.rot_services = NULL,
54-
.rot_services_count = ITS_ROT_SRV_COUNT,
55-
.extern_sids = NULL,
56-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
54+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
55+
.extern_sids = psa_f_external_sids,
56+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
5757
.irq_mapper = NULL,
5858
},
5959
{
60-
.partition_id = PSA_F_ID,
60+
.partition_id = ITS_ID,
6161
.thread_id = 0,
62-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
62+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
6363
.flags_interrupts = 0,
6464
.rot_services = NULL,
65-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
66-
.extern_sids = psa_f_external_sids,
67-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
65+
.rot_services_count = ITS_ROT_SRV_COUNT,
66+
.extern_sids = NULL,
67+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
6868
.irq_mapper = NULL,
6969
},
7070
};
@@ -78,8 +78,8 @@ const uint32_t mem_region_count = 0;
7878

7979
// forward declaration of partition initializers
8080
void test_its_reset_init(spm_partition_t *partition);
81-
void its_init(spm_partition_t *partition);
8281
void psa_f_init(spm_partition_t *partition);
82+
void its_init(spm_partition_t *partition);
8383

8484
uint32_t init_partitions(spm_partition_t **partitions)
8585
{
@@ -88,8 +88,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
8888
}
8989

9090
test_its_reset_init(&(g_partitions[0]));
91-
its_init(&(g_partitions[1]));
92-
psa_f_init(&(g_partitions[2]));
91+
psa_f_init(&(g_partitions[1]));
92+
its_init(&(g_partitions[2]));
9393

9494
*partitions = g_partitions;
9595
return 3;

‎TESTS/psa/spm_client/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "handles_manager.h"
2929
#include "cmsis.h"
3030
#include "psa_client_tests_part1_partition.h"
31-
#include "psa_its_partition.h"
3231
#include "psa_psa_f_partition.h"
32+
#include "psa_its_partition.h"
3333

3434
extern const uint32_t psa_f_external_sids[4];
3535

@@ -46,25 +46,25 @@ spm_partition_t g_partitions[3] = {
4646
.irq_mapper = NULL,
4747
},
4848
{
49-
.partition_id = ITS_ID,
49+
.partition_id = PSA_F_ID,
5050
.thread_id = 0,
51-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
51+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
5252
.flags_interrupts = 0,
5353
.rot_services = NULL,
54-
.rot_services_count = ITS_ROT_SRV_COUNT,
55-
.extern_sids = NULL,
56-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
54+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
55+
.extern_sids = psa_f_external_sids,
56+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
5757
.irq_mapper = NULL,
5858
},
5959
{
60-
.partition_id = PSA_F_ID,
60+
.partition_id = ITS_ID,
6161
.thread_id = 0,
62-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
62+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
6363
.flags_interrupts = 0,
6464
.rot_services = NULL,
65-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
66-
.extern_sids = psa_f_external_sids,
67-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
65+
.rot_services_count = ITS_ROT_SRV_COUNT,
66+
.extern_sids = NULL,
67+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
6868
.irq_mapper = NULL,
6969
},
7070
};
@@ -78,8 +78,8 @@ const uint32_t mem_region_count = 0;
7878

7979
// forward declaration of partition initializers
8080
void client_tests_part1_init(spm_partition_t *partition);
81-
void its_init(spm_partition_t *partition);
8281
void psa_f_init(spm_partition_t *partition);
82+
void its_init(spm_partition_t *partition);
8383

8484
uint32_t init_partitions(spm_partition_t **partitions)
8585
{
@@ -88,8 +88,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
8888
}
8989

9090
client_tests_part1_init(&(g_partitions[0]));
91-
its_init(&(g_partitions[1]));
92-
psa_f_init(&(g_partitions[2]));
91+
psa_f_init(&(g_partitions[1]));
92+
its_init(&(g_partitions[2]));
9393

9494
*partitions = g_partitions;
9595
return 3;

‎TESTS/psa/spm_server/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include "cmsis.h"
3030
#include "psa_server_test_part1_partition.h"
3131
#include "psa_server_test_part2_partition.h"
32-
#include "psa_its_partition.h"
3332
#include "psa_psa_f_partition.h"
33+
#include "psa_its_partition.h"
3434

3535
extern const uint32_t server_test_part1_external_sids[2];
3636
extern const uint32_t psa_f_external_sids[4];
@@ -59,25 +59,25 @@ spm_partition_t g_partitions[4] = {
5959
.irq_mapper = NULL,
6060
},
6161
{
62-
.partition_id = ITS_ID,
62+
.partition_id = PSA_F_ID,
6363
.thread_id = 0,
64-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
64+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
6565
.flags_interrupts = 0,
6666
.rot_services = NULL,
67-
.rot_services_count = ITS_ROT_SRV_COUNT,
68-
.extern_sids = NULL,
69-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
67+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
68+
.extern_sids = psa_f_external_sids,
69+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
7070
.irq_mapper = NULL,
7171
},
7272
{
73-
.partition_id = PSA_F_ID,
73+
.partition_id = ITS_ID,
7474
.thread_id = 0,
75-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
75+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
7676
.flags_interrupts = 0,
7777
.rot_services = NULL,
78-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
79-
.extern_sids = psa_f_external_sids,
80-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
78+
.rot_services_count = ITS_ROT_SRV_COUNT,
79+
.extern_sids = NULL,
80+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
8181
.irq_mapper = NULL,
8282
},
8383
};
@@ -92,8 +92,8 @@ const uint32_t mem_region_count = 0;
9292
// forward declaration of partition initializers
9393
void server_test_part1_init(spm_partition_t *partition);
9494
void server_test_part2_init(spm_partition_t *partition);
95-
void its_init(spm_partition_t *partition);
9695
void psa_f_init(spm_partition_t *partition);
96+
void its_init(spm_partition_t *partition);
9797

9898
uint32_t init_partitions(spm_partition_t **partitions)
9999
{
@@ -103,8 +103,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
103103

104104
server_test_part1_init(&(g_partitions[0]));
105105
server_test_part2_init(&(g_partitions[1]));
106-
its_init(&(g_partitions[2]));
107-
psa_f_init(&(g_partitions[3]));
106+
psa_f_init(&(g_partitions[2]));
107+
its_init(&(g_partitions[3]));
108108

109109
*partitions = g_partitions;
110110
return 4;

‎TESTS/psa/spm_smoke/COMPONENT_SPE/psa_setup.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "handles_manager.h"
2929
#include "cmsis.h"
3030
#include "psa_smoke_test_part1_partition.h"
31-
#include "psa_its_partition.h"
3231
#include "psa_psa_f_partition.h"
32+
#include "psa_its_partition.h"
3333

3434
extern const uint32_t psa_f_external_sids[4];
3535

@@ -46,25 +46,25 @@ spm_partition_t g_partitions[3] = {
4646
.irq_mapper = NULL,
4747
},
4848
{
49-
.partition_id = ITS_ID,
49+
.partition_id = PSA_F_ID,
5050
.thread_id = 0,
51-
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
51+
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
5252
.flags_interrupts = 0,
5353
.rot_services = NULL,
54-
.rot_services_count = ITS_ROT_SRV_COUNT,
55-
.extern_sids = NULL,
56-
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
54+
.rot_services_count = PSA_F_ROT_SRV_COUNT,
55+
.extern_sids = psa_f_external_sids,
56+
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
5757
.irq_mapper = NULL,
5858
},
5959
{
60-
.partition_id = PSA_F_ID,
60+
.partition_id = ITS_ID,
6161
.thread_id = 0,
62-
.flags_rot_srv = PSA_F_WAIT_ANY_SID_MSK,
62+
.flags_rot_srv = ITS_WAIT_ANY_SID_MSK,
6363
.flags_interrupts = 0,
6464
.rot_services = NULL,
65-
.rot_services_count = PSA_F_ROT_SRV_COUNT,
66-
.extern_sids = psa_f_external_sids,
67-
.extern_sids_count = PSA_F_EXT_ROT_SRV_COUNT,
65+
.rot_services_count = ITS_ROT_SRV_COUNT,
66+
.extern_sids = NULL,
67+
.extern_sids_count = ITS_EXT_ROT_SRV_COUNT,
6868
.irq_mapper = NULL,
6969
},
7070
};
@@ -78,8 +78,8 @@ const uint32_t mem_region_count = 0;
7878

7979
// forward declaration of partition initializers
8080
void smoke_test_part1_init(spm_partition_t *partition);
81-
void its_init(spm_partition_t *partition);
8281
void psa_f_init(spm_partition_t *partition);
82+
void its_init(spm_partition_t *partition);
8383

8484
uint32_t init_partitions(spm_partition_t **partitions)
8585
{
@@ -88,8 +88,8 @@ uint32_t init_partitions(spm_partition_t **partitions)
8888
}
8989

9090
smoke_test_part1_init(&(g_partitions[0]));
91-
its_init(&(g_partitions[1]));
92-
psa_f_init(&(g_partitions[2]));
91+
psa_f_init(&(g_partitions[1]));
92+
its_init(&(g_partitions[2]));
9393

9494
*partitions = g_partitions;
9595
return 3;

0 commit comments

Comments
 (0)