Skip to content

Commit 3e47925

Browse files
committed
freertos-integration-tests: Fix uncrustify check failures
Signed-off-by: Devaraj Ranganna <[email protected]>
1 parent 6224da5 commit 3e47925

File tree

2 files changed

+46
-41
lines changed

2 files changed

+46
-41
lines changed

Projects/aws-iot-example/freertos-integration-tests/include/test_execution_config.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,31 @@
4343
/**
4444
* @brief Configuration to enable Device Advisor testing.
4545
*/
46-
#define DEVICE_ADVISOR_TEST_ENABLED (0)
46+
#define DEVICE_ADVISOR_TEST_ENABLED ( 0 )
47+
4748
/**
4849
* @brief Configuration to enable the MQTT test.
4950
*/
50-
#define MQTT_TEST_ENABLED (1)
51+
#define MQTT_TEST_ENABLED ( 1 )
52+
5153
/**
5254
* @brief Configuration to enable the transport interface test.
5355
*/
54-
#define TRANSPORT_INTERFACE_TEST_ENABLED (1)
56+
#define TRANSPORT_INTERFACE_TEST_ENABLED ( 1 )
57+
5558
/**
5659
* @brief Configuration to enable the OTA PAL test.
5760
*/
58-
#define OTA_PAL_TEST_ENABLED (1)
61+
#define OTA_PAL_TEST_ENABLED ( 1 )
62+
5963
/**
6064
* @brief Configuration to enable the OTA End-to-end test.
6165
*/
62-
#define OTA_E2E_TEST_ENABLED (0)
66+
#define OTA_E2E_TEST_ENABLED ( 0 )
67+
6368
/**
6469
* @brief Configuration to enable the corePKCS11 test.
6570
*/
66-
#define CORE_PKCS11_TEST_ENABLED (1)
71+
#define CORE_PKCS11_TEST_ENABLED ( 1 )
6772

6873
#endif /* TEST_EXECUTION_CONFIG_H */

Projects/aws-iot-example/freertos-integration-tests/include/test_param_config.h

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,36 +41,36 @@
4141
* a new on-device key pair and output public key. When set to 0, the device
4242
* should keep existing key pair.
4343
*/
44-
#define FORCE_GENERATE_NEW_KEY_PAIR 0
44+
#define FORCE_GENERATE_NEW_KEY_PAIR 0
4545

4646
/**
4747
* @brief Endpoint of the MQTT broker to connect to in mqtt test.
4848
*/
49-
#define MQTT_SERVER_ENDPOINT clientcredentialMQTT_BROKER_ENDPOINT
49+
#define MQTT_SERVER_ENDPOINT clientcredentialMQTT_BROKER_ENDPOINT
5050

5151
/**
5252
* @brief Port of the MQTT broker to connect to in mqtt test.
5353
*/
54-
#define MQTT_SERVER_PORT clientcredentialMQTT_BROKER_PORT
54+
#define MQTT_SERVER_PORT clientcredentialMQTT_BROKER_PORT
5555

5656
/**
5757
* @brief The client identifier for MQTT test.
5858
*/
59-
#define MQTT_TEST_CLIENT_IDENTIFIER clientcredentialIOT_THING_NAME
59+
#define MQTT_TEST_CLIENT_IDENTIFIER clientcredentialIOT_THING_NAME
6060

6161
/**
6262
* @brief Network buffer size specified in bytes. Must be large enough to hold the maximum
6363
* anticipated MQTT payload.
6464
*/
65-
#define MQTT_TEST_NETWORK_BUFFER_SIZE (1000)
65+
#define MQTT_TEST_NETWORK_BUFFER_SIZE ( 1000 )
6666

6767
/**
6868
* @brief Timeout for MQTT_ProcessLoop() function in milliseconds.
6969
* The timeout value is appropriately chosen for receiving an incoming
7070
* PUBLISH message and ack responses for QoS 1 and QoS 2 communications
7171
* with the broker.
7272
*/
73-
#define MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS (4000)
73+
#define MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ( 4000 )
7474

7575
/**
7676
* @brief Root certificate of the IoT Core.
@@ -114,7 +114,7 @@
114114
* "...base64 data...\n"\
115115
* "-----END CERTIFICATE-----\n"
116116
*/
117-
#define MQTT_CLIENT_CERTIFICATE keyCLIENT_CERTIFICATE_PEM
117+
#define MQTT_CLIENT_CERTIFICATE keyCLIENT_CERTIFICATE_PEM
118118

119119
/**
120120
* @brief Client private key to connect to MQTT server.
@@ -123,17 +123,17 @@
123123
*
124124
* For qualification, the key should be generated on-device.
125125
*/
126-
#define MQTT_CLIENT_PRIVATE_KEY keyCLIENT_PRIVATE_KEY_PEM
126+
#define MQTT_CLIENT_PRIVATE_KEY keyCLIENT_PRIVATE_KEY_PEM
127127

128128
/**
129129
* @brief Endpoint of the echo server to connect to in transport interface test.
130130
*/
131-
#define ECHO_SERVER_ENDPOINT "localhost"
131+
#define ECHO_SERVER_ENDPOINT "localhost"
132132

133133
/**
134134
* @brief Port of the echo server to connect to in transport interface test.
135135
*/
136-
#define ECHO_SERVER_PORT (9000)
136+
#define ECHO_SERVER_PORT ( 9000 )
137137

138138
/**
139139
* @brief Root certificate of the echo server.
@@ -179,69 +179,69 @@
179179
* #define TEST_START_DELAY_MS 5000
180180
*/
181181

182-
#define OTA_RSA_SHA1 1
183-
#define OTA_RSA_SHA256 2
184-
#define OTA_ECDSA_SHA256 3
182+
#define OTA_RSA_SHA1 1
183+
#define OTA_RSA_SHA256 2
184+
#define OTA_ECDSA_SHA256 3
185185

186186
/**
187187
* @brief Certificate type for OTA PAL test.
188188
* Valid options are: OTA_RSA_SHA1, OTA_RSA_SHA256, OTA_ECDSA_SHA256.
189189
*/
190-
#define OTA_PAL_TEST_CERT_TYPE OTA_RSA_SHA256
190+
#define OTA_PAL_TEST_CERT_TYPE OTA_RSA_SHA256
191191

192192
/**
193193
* @brief Path to cert for OTA test PAL. Used to verify signature.
194194
* If applicable, the device must be pre-provisioned with this certificate. Please see
195195
* test/common/ota/test_files for the set of certificates.
196196
*/
197-
#define OTA_PAL_CERTIFICATE_FILE "ecdsa-sha256-signer.crt.pem"
197+
#define OTA_PAL_CERTIFICATE_FILE "ecdsa-sha256-signer.crt.pem"
198198

199199
/**
200200
* @brief Some devices have a hard-coded name for the firmware image to boot.
201201
*/
202-
#define OTA_PAL_FIRMWARE_FILE "non_secure image"
202+
#define OTA_PAL_FIRMWARE_FILE "non_secure image"
203203

204204
/**
205205
* @brief Some boards OTA PAL layers will use the file names passed into it for the
206206
* image and the certificates because their non-volatile memory is abstracted by a
207207
* file system. Set this to 1 if that is the case for your device.
208208
*/
209-
#define OTA_PAL_USE_FILE_SYSTEM 0
209+
#define OTA_PAL_USE_FILE_SYSTEM 0
210210

211211
/**
212212
* @brief The PKCS #11 supports RSA key function.
213213
*
214214
* Set to 1 if RSA private keys are supported by the platform. 0 if not.
215215
*/
216-
#define PKCS11_TEST_RSA_KEY_SUPPORT (1)
216+
#define PKCS11_TEST_RSA_KEY_SUPPORT ( 1 )
217217

218218
/**
219219
* @brief The PKCS #11 supports EC key function.
220220
*
221221
* Set to 1 if elliptic curve private keys are supported by the platform. 0 if not.
222222
*/
223-
#define PKCS11_TEST_EC_KEY_SUPPORT (0)
223+
#define PKCS11_TEST_EC_KEY_SUPPORT ( 0 )
224224

225225
/**
226226
* @brief The PKCS #11 supports import key method.
227227
*
228228
* Set to 1 if importing device private key via C_CreateObject is supported. 0 if not.
229229
*/
230-
#define PKCS11_TEST_IMPORT_PRIVATE_KEY_SUPPORT (0)
230+
#define PKCS11_TEST_IMPORT_PRIVATE_KEY_SUPPORT ( 0 )
231231

232232
/**
233233
* @brief The PKCS #11 supports generate keypair method.
234234
*
235235
* Set to 1 if generating a device private-public key pair via C_GenerateKeyPair. 0 if not.
236236
*/
237-
#define PKCS11_TEST_GENERATE_KEYPAIR_SUPPORT (1)
237+
#define PKCS11_TEST_GENERATE_KEYPAIR_SUPPORT ( 1 )
238238

239239
/**
240240
* @brief The PKCS #11 supports preprovisioning method.
241241
*
242242
* Set to 1 if preprovisioning is supported.
243243
*/
244-
#define PKCS11_TEST_PREPROVISIONED_SUPPORT (0)
244+
#define PKCS11_TEST_PREPROVISIONED_SUPPORT ( 0 )
245245

246246
/**
247247
* @brief The PKCS #11 label for device private key for test.
@@ -250,7 +250,7 @@
250250
* For devices with secure elements or hardware limitations, this may be defined
251251
* to a different label to preserve AWS IoT credentials for other test suites.
252252
*/
253-
#define PKCS11_TEST_LABEL_DEVICE_PRIVATE_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PRIVATE_KEY_FOR_TLS
253+
#define PKCS11_TEST_LABEL_DEVICE_PRIVATE_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PRIVATE_KEY_FOR_TLS
254254

255255
/**
256256
* @brief The PKCS #11 label for device public key.
@@ -259,7 +259,7 @@
259259
* For devices with secure elements or hardware limitations, this may be defined
260260
* to a different label to preserve AWS IoT credentials for other test suites.
261261
*/
262-
#define PKCS11_TEST_LABEL_DEVICE_PUBLIC_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PUBLIC_KEY_FOR_TLS
262+
#define PKCS11_TEST_LABEL_DEVICE_PUBLIC_KEY_FOR_TLS pkcs11configLABEL_DEVICE_PUBLIC_KEY_FOR_TLS
263263

264264
/**
265265
* @brief The PKCS #11 label for the device certificate.
@@ -268,7 +268,7 @@
268268
* For devices with secure elements or hardware limitations, this may be defined
269269
* to a different label to preserve AWS IoT credentials for other test suites.
270270
*/
271-
#define PKCS11_TEST_LABEL_DEVICE_CERTIFICATE_FOR_TLS pkcs11configLABEL_DEVICE_CERTIFICATE_FOR_TLS
271+
#define PKCS11_TEST_LABEL_DEVICE_CERTIFICATE_FOR_TLS pkcs11configLABEL_DEVICE_CERTIFICATE_FOR_TLS
272272

273273
/**
274274
* @brief The PKCS #11 supports storage for JITP.
@@ -280,50 +280,50 @@
280280
* Set to 1 if PKCS #11 supports storage for JITP certificate, code verify certificate,
281281
* and trusted server root certificate.
282282
*/
283-
#define PKCS11_TEST_JITP_CODEVERIFY_ROOT_CERT_SUPPORTED pkcs11configJITP_CODEVERIFY_ROOT_CERT_SUPPORTED
283+
#define PKCS11_TEST_JITP_CODEVERIFY_ROOT_CERT_SUPPORTED pkcs11configJITP_CODEVERIFY_ROOT_CERT_SUPPORTED
284284

285285
/**
286286
* @brief The PKCS #11 label for the object to be used for code verification.
287287
*
288288
* This label has to be defined if PKCS11_TEST_JITP_CODEVERIFY_ROOT_CERT_SUPPORTED is set to 1.
289289
*/
290-
#define PKCS11_TEST_LABEL_CODE_VERIFICATION_KEY pkcs11configLABEL_CODE_VERIFICATION_KEY
290+
#define PKCS11_TEST_LABEL_CODE_VERIFICATION_KEY pkcs11configLABEL_CODE_VERIFICATION_KEY
291291

292292
/**
293293
* @brief The PKCS #11 label for Just-In-Time-Provisioning.
294294
*
295295
* This label has to be defined if PKCS11_TEST_JITP_CODEVERIFY_ROOT_CERT_SUPPORTED is set to 1.
296296
*/
297-
#define PKCS11_TEST_LABEL_JITP_CERTIFICATE pkcs11configLABEL_JITP_CERTIFICATE
297+
#define PKCS11_TEST_LABEL_JITP_CERTIFICATE pkcs11configLABEL_JITP_CERTIFICATE
298298

299299
/**
300300
* @brief The PKCS #11 label for the AWS Trusted Root Certificate.
301301
*
302302
* This label has to be defined if PKCS11_TEST_JITP_CODEVERIFY_ROOT_CERT_SUPPORTED is set to 1.
303303
*/
304-
#define PKCS11_TEST_LABEL_ROOT_CERTIFICATE pkcs11configLABEL_ROOT_CERTIFICATE
304+
#define PKCS11_TEST_LABEL_ROOT_CERTIFICATE pkcs11configLABEL_ROOT_CERTIFICATE
305305

306306
/**
307307
* @brief The IoT Thing name for the device for OTA test.
308308
*/
309-
#define IOT_THING_NAME clientcredentialIOT_THING_NAME
309+
#define IOT_THING_NAME clientcredentialIOT_THING_NAME
310310

311311
/**
312312
* @brief Major version for OTA E2E test.
313313
*/
314-
#define OTA_APP_VERSION_MAJOR 0
314+
#define OTA_APP_VERSION_MAJOR 0
315315

316316
/**
317317
* @brief Major version for OTA E2E test.
318318
*/
319-
#define OTA_APP_VERSION_MINOR 9
319+
#define OTA_APP_VERSION_MINOR 9
320320

321321
/**
322322
* @brief Major version for OTA E2E test.
323323
*/
324-
#define OTA_APP_VERSION_BUILD 1
324+
#define OTA_APP_VERSION_BUILD 1
325325

326-
#define OUTGOING_PUBLISH_RECORD_COUNT 20
327-
#define INCOMING_PUBLISH_RECORD_COUNT 20
326+
#define OUTGOING_PUBLISH_RECORD_COUNT 20
327+
#define INCOMING_PUBLISH_RECORD_COUNT 20
328328

329329
#endif /* TEST_PARAM_CONFIG_H */

0 commit comments

Comments
 (0)