alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/tskNO_AFFINITY_ambiguous' into 'master'

Browse Source 
FreeRTOS: Change tskNO_AFFINITY value to not match CPU 1 when UNICORE is set



See merge request !27
This commit is contained in:
Jeroen Domburg 2016-08-25 11:48:21 +08:00
commit 803aef6e97
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -31,7 +31,7 @@ test_build_system:
variables:
IDF_PATH: "$CI_PROJECT_DIR"
script:
- ./make/build_system_tests.sh
- ./make/test_build_system.sh
push_master_to_github:
stage: deploy

4
components/freertos/include/freertos/task.h
View File

@ -75,6 +75,8 @@
#error "include FreeRTOS.h must appear in source files before include task.h"
#endif
#include <limits.h>
#include "list.h"
#include "portmacro.h"
@ -91,7 +93,7 @@ extern "C" {
#define tskKERNEL_VERSION_MINOR 2
#define tskKERNEL_VERSION_BUILD 0
#define tskNO_AFFINITY portNUM_PROCESSORS
#define tskNO_AFFINITY INT_MAX
/**
* task. h

18
make/build_system_tests.sh → make/test_build_system.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
#
# Build system tests
# Test the build system for basic consistency
#
# Just a bash script that tests some likely make failure scenarios in a row
# Creates its own test build directory under TMP and cleans it up when done.
@ -131,6 +131,18 @@ function assert_built()
done
}
# Test if a file has been rebuilt.
function file_was_rebuilt()
{
# can't use [ a -ot b ] here as -ot only gives second resolution
# but stat -c %y seems to be microsecond at least for tmpfs, ext4..
if [ "$(stat -c %y ${SNAPSHOT}/$1)" != "$(stat -c %y ${BUILD}/$1)" ]; then
return 0
else
return 1
fi
}
# verify all the arguments passed in were rebuilt relative to the snapshot
function assert_rebuilt()
{
@ -139,7 +151,7 @@ function assert_rebuilt()
if [ ! -f "${SNAPSHOT}/$1" ]; then
failure "File $1 should have been original build snapshot"
fi
if [ ! "${SNAPSHOT}/$1" -ot "${BUILD}/$1" ]; then
if ! file_was_rebuilt "$1"; then
failure "File $1 should have been rebuilt"
fi
shift
@ -155,7 +167,7 @@ function assert_not_rebuilt()
if [ ! -f "${SNAPSHOT}/$1" ]; then
failure "File $1 should be in snapshot build directory"
fi
if [ "${SNAPSHOT}/$1" -ot "${BUILD}/$1" ]; then
if file_was_rebuilt "$1"; then
failure "File $1 should not have been rebuilt"
fi
shift