pulling in the useful parts of Daniel's changes
diff --git a/aos/atom_code/init.cc b/aos/atom_code/init.cc
index b3668e8..033a206 100644
--- a/aos/atom_code/init.cc
+++ b/aos/atom_code/init.cc
@@ -30,9 +30,9 @@
}
rlim.rlim_cur = soft;
if (setrlimit64(resource, &rlim) == -1) {
- Die("%s-init: setrlimit64(%d, {cur=%jd,max=%jd})"
+ Die("%s-init: setrlimit64(%d, {cur=%ju,max=%ju})"
" failed with %d (%s)\n", program_invocation_short_name,
- resource, (intmax_t)rlim.rlim_cur, (intmax_t)rlim.rlim_max,
+ resource, (uintmax_t)rlim.rlim_cur, (uintmax_t)rlim.rlim_max,
errno, strerror(errno));
}
}
diff --git a/aos/build/download_externals.sh b/aos/build/download_externals.sh
index 778c358..5b759a8 100755
--- a/aos/build/download_externals.sh
+++ b/aos/build/download_externals.sh
@@ -8,8 +8,8 @@
CROSS_COMPILE=arm-linux-gnueabihf-
-export CC=${CROSS_COMPLIE}gcc-4.7
-export CXX=${CROSS_COMPLIE}g++-4.7
+export CC=${CROSS_COMPILE}gcc-4.7
+export CXX=${CROSS_COMPILE}g++-4.7
export CFLAGS="-mcpu=cortex-a8 -mfpu=neon"
export CXXFLAGS="-mcpu=cortex-a8 -mfpu=neon"
export OBJDUMP=${CROSS_COMPLIE}objdump
diff --git a/bbb_cape/src/bbb/bbb.gyp b/bbb_cape/src/bbb/bbb.gyp
index 9ea4bb3..a57ea23 100644
--- a/bbb_cape/src/bbb/bbb.gyp
+++ b/bbb_cape/src/bbb/bbb.gyp
@@ -66,18 +66,6 @@
'crc',
],
},
- #{
- # 'target_name': 'uart_reader_test',
- # 'type': 'executable',
- # 'dependencies': [
- # 'uart_reader',
- # '<(EXTERNALS):gtest',
- # '<(AOS)/build/aos.gyp:logging',
- # ],
- # 'sources': [
- # 'uart_reader_test.cc',
- # ],
- #},
{
'target_name': 'uart_reader_main',
'type': 'executable',
diff --git a/bbb_cape/src/bbb/uart_reader_test.cc b/bbb_cape/src/bbb/uart_reader_test.cc
deleted file mode 100644
index 53be07e..0000000
--- a/bbb_cape/src/bbb/uart_reader_test.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "bbb/uart_reader.h"
-
-#include "gtest/gtest.h"
-
-namespace bbb {
-namespace {
-
-class UartReaderTest : public ::testing::Test {
-protected:
- UartReader test_instance_;
-
-public:
- UartReaderTest () : test_instance_(UartReader(3000000)) {}
-};
-
-#if 0
-TEST_F(UartReaderTest, SetUpTest) {
- // Test its ability to open a file descriptor and set a baud rate.
- ASSERT_EQ(test_instance_.SetUp(), 0);
-}
-#endif
-
-} // namespace
-} // namespace bbb