| author | Rich Burridge <rich.burridge@oracle.com> |
| Tue, 09 Sep 2014 06:23:38 -0700 | |
| branch | s11-update |
| changeset 3299 | d85f3b182224 |
| parent 2705 | e39a44e3cb41 |
| permissions | -rw-r--r-- |
|
2705
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
1 |
This patch fixes the tests to run on solaris. |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
2 |
This patch has not been contributed upstream, but is planned to be done by |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
3 |
2013-Jul-12. |
|
e39a44e3cb41
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
848
diff
changeset
|
4 |
|
|
848
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
--- openscap-0.8.1/tests/API/SEAP/test_api_seap_parser.c.orig 2012-04-16 05:46:10.857636161 -0700 |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
+++ openscap-0.8.1/tests/API/SEAP/test_api_seap_parser.c 2012-04-16 05:46:33.459579066 -0700 |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
@@ -52,7 +52,7 @@ |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
#elif defined(__linux__) || defined(__GLIBC__) |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
getline (&input, &inlen, stdin); |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
#elif defined(__SVR4) && defined(__sun) |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
- rpl_getline (&input, &inlen, stdin); |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+ getline (&input, &inlen, stdin); |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
#else |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
# error "FIXME" |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
#endif |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
--- openscap-0.8.1/tests/API/SEAP/test_api_sexp_ID.c.orig 2012-04-16 05:47:12.392123448 -0700 |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
+++ openscap-0.8.1/tests/API/SEAP/test_api_sexp_ID.c 2012-04-16 05:47:21.468821876 -0700 |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
@@ -42,7 +42,7 @@ |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
#elif defined(__linux__) || defined(__GLIBC__) |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
getline (&input, &inlen, stdin); |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
#elif defined(__SVR4) && defined(__sun) |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
- rpl_getline (&input, &inlen, stdin); |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
+ getline (&input, &inlen, stdin); |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
#else |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
# error "FIXME" |
|
0c3d865471c8
PSARC 2012/152 Compliance Phase 0: OpenSCAP
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
#endif |