Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the sim build. disables the tests for now.

Browse Source
This commit is contained in:
Joe Onorato
2009-05-06 12:55:46 -04:00
parent 1e09a72a75
commit c825d3ebd6
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils/backup_helpers.h
View File

@@ -4,7 +4,7 @@
int back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream, int back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream,
char const* fileBase, char const* const* files, int fileCount); char const* fileBase, char const* const* files, int fileCount);
#define TEST_BACKUP_HELPERS 1 #define TEST_BACKUP_HELPERS 0
#if TEST_BACKUP_HELPERS #if TEST_BACKUP_HELPERS
int backup_helper_test_empty(); int backup_helper_test_empty();

4
libs/utils/file_backup_helper.cpp
View File

@@ -13,6 +13,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <utime.h>
#include <fcntl.h> #include <fcntl.h>
#include <zlib.h> #include <zlib.h>
@@ -224,7 +225,8 @@ back_up_files(int oldSnapshotFD, int newSnapshotFD, int oldDataStream,
} }
s.modTime_sec = st.st_mtime; s.modTime_sec = st.st_mtime;
s.modTime_nsec = st.st_mtime_nsec; s.modTime_nsec = 0; // workaround sim breakage
//s.modTime_nsec = st.st_mtime_nsec;
s.size = st.st_size; s.size = st.st_size;
s.crc32 = compute_crc32(realFilename); s.crc32 = compute_crc32(realFilename);

13
tests/backup/backup_helper_test.cpp
View File

@@ -3,9 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if !(TEST_BACKUP_HELPERS) #if TEST_BACKUP_HELPERS
#error These tests require TEST_BACKUP_HELPERS to be defined.
#endif
// ============================================================ // ============================================================
// ============================================================ // ============================================================
@@ -95,3 +93,12 @@ main(int argc, const char** argv)
} }
} }
} }
#else
int
main(int argc, char** argv)
{
printf ("test_backup_helper built without the tests\n");
return 0;
}
#endif